Prechádzať zdrojové kódy

前端 页面筛选样式统一及部分bug sdy

zhongtianhaoyuan 4 rokov pred
rodič
commit
f1a0678c5c
41 zmenil súbory, kde vykonal 2178 pridanie a 74 odobranie
  1. BIN
      public/img/icons/apple-touch-icon-152x152.png
  2. BIN
      public/img/icons/favicon-16x16.png
  3. BIN
      public/img/icons/favicon-32x32.png
  4. BIN
      public/img/icons/winseaLogo-152x152.png
  5. BIN
      public/img/icons/winseaLogo-33x33.png
  6. BIN
      public/img/icons/winseaLogo_144x144.png
  7. BIN
      public/img/icons/winseaLogo_16x16.png
  8. 3 2
      public/index.html
  9. 539 0
      public/static/iconfont/demo.css
  10. 349 0
      public/static/iconfont/demo_index.html
  11. 0 3
      public/static/iconfont/iconfont.css
  12. BIN
      public/static/iconfont/iconfont.eot
  13. 0 0
      public/static/iconfont/iconfont.js
  14. 58 0
      public/static/iconfont/iconfont.json
  15. BIN
      public/static/iconfont/iconfont.ttf
  16. BIN
      public/static/iconfont/iconfont.woff
  17. BIN
      public/static/iconfont/iconfont.woff2
  18. 539 0
      public/static/sidebar/demo.css
  19. 349 0
      public/static/sidebar/demo_index.html
  20. 43 0
      public/static/sidebar/iconfont.css
  21. 0 0
      public/static/sidebar/iconfont.js
  22. 58 0
      public/static/sidebar/iconfont.json
  23. BIN
      public/static/sidebar/iconfont.ttf
  24. BIN
      public/static/sidebar/iconfont.woff
  25. BIN
      public/static/sidebar/iconfont.woff2
  26. 2 0
      src/lang/zh.js
  27. 4 3
      src/layout/index/logo.vue
  28. 1 0
      src/layout/index/sidebar/sidebarItem.vue
  29. 1 1
      src/layout/index/top/index.vue
  30. 2 2
      src/router/index.js
  31. 1 1
      src/views/contractManagement/component/routers/route.js
  32. 17 2
      src/views/taskManagement/component/routers/route.js
  33. 5 1
      src/views/taskManagement/tranManagementLook.vue
  34. 3 1
      src/views/taskManagement/tranManagementTransport.vue
  35. 95 27
      src/views/taskManagement/tranManagementTransportAdd.vue
  36. 61 24
      src/views/taskManagement/tranManagementTransportEdit.vue
  37. 2 2
      src/views/taskManagement/tranManagementWarehouseInOutTask.vue
  38. 40 1
      src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue
  39. 1 1
      src/views/tranManagement/component/routers/route.js
  40. 1 1
      src/views/warehouse/component/router/index.js
  41. 4 2
      vue.config.js

BIN
public/img/icons/apple-touch-icon-152x152.png


BIN
public/img/icons/favicon-16x16.png


BIN
public/img/icons/favicon-32x32.png


BIN
public/img/icons/winseaLogo-152x152.png


BIN
public/img/icons/winseaLogo-33x33.png


BIN
public/img/icons/winseaLogo_144x144.png


BIN
public/img/icons/winseaLogo_16x16.png


+ 3 - 2
public/index.html

@@ -8,18 +8,19 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
   <!-- 强制Chromium内核,作用于360浏览器、QQ浏览器等国产双核浏览器 -->
   <!-- 强制Chromium内核,作用于360浏览器、QQ浏览器等国产双核浏览器 -->
   <meta name="renderer" content="webkit" />
   <meta name="renderer" content="webkit" />
-  <link rel="icon" href="<%= BASE_URL %>logo.ico">
+  <link rel="icon" href="<%= BASE_URL %>/logo.ico">
   <!-- 强制Chromium内核,作用于其他双核浏览器 -->
   <!-- 强制Chromium内核,作用于其他双核浏览器 -->
   <meta name="force-rendering" content="webkit" />
   <meta name="force-rendering" content="webkit" />
 
 
   <!-- 如果有安装 Google Chrome Frame 插件则强制为Chromium内核,否则强制本机支持的最高版本IE内核,作用于IE浏览器 -->
   <!-- 如果有安装 Google Chrome Frame 插件则强制为Chromium内核,否则强制本机支持的最高版本IE内核,作用于IE浏览器 -->
   <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
   <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
   <link rel="manifest" href="<%= BASE_URL %>/manifest.json" />
   <link rel="manifest" href="<%= BASE_URL %>/manifest.json" />
-  <link rel="icon" href="<%= BASE_URL %>logo.ico">
+  <link rel="icon" href="<%= BASE_URL %>/logo.ico">
   <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV]) { %>
   <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV]) { %>
       <link href="<%= htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV][i] %>" rel="stylesheet">
       <link href="<%= htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV][i] %>" rel="stylesheet">
   <% } %>
   <% } %>
   <title>易粮易运</title>
   <title>易粮易运</title>
+  <link rel="icon" href="<%= BASE_URL %>/logo.ico">
   <% if (process.env.NODE_ENV === 'production') { %>
   <% if (process.env.NODE_ENV === 'production') { %>
     <script>
     <script>
     !(function(c,i,e,b){var h = i.createElement("script");var f = i.getElementsByTagName("script")[0];h.type = "text/javascript";h.crossorigin = true;h.onload = function(){try {c[b]||(c[b] = new c.wpkReporter({bid: 'qj3rmxes-10jz7agi',spa: true,  plugins: []}));c[b].installAll();} catch (e) {console.error('init wpkReporter fail', e);}};f.parentNode.insertBefore(h, f);h.src = e})(window, document, "https://g.alicdn.com/woodpeckerx/jssdk??wpkReporter.js", "__wpk");
     !(function(c,i,e,b){var h = i.createElement("script");var f = i.getElementsByTagName("script")[0];h.type = "text/javascript";h.crossorigin = true;h.onload = function(){try {c[b]||(c[b] = new c.wpkReporter({bid: 'qj3rmxes-10jz7agi',spa: true,  plugins: []}));c[b].installAll();} catch (e) {console.error('init wpkReporter fail', e);}};f.parentNode.insertBefore(h, f);h.src = e})(window, document, "https://g.alicdn.com/woodpeckerx/jssdk??wpkReporter.js", "__wpk");

+ 539 - 0
public/static/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;
+}

+ 349 - 0
public/static/iconfont/demo_index.html

@@ -0,0 +1,349 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>iconfont Demo</title>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
+  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
+  <link rel="stylesheet" href="demo.css">
+  <link rel="stylesheet" href="iconfont.css">
+  <script src="iconfont.js"></script>
+  <!-- jQuery -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
+  <!-- 代码高亮 -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
+    <div class="nav-tabs">
+      <ul id="tabs" class="dib-box">
+        <li class="dib active"><span>Unicode</span></li>
+        <li class="dib"><span>Font class</span></li>
+        <li class="dib"><span>Symbol</span></li>
+      </ul>
+      
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=2554236" target="_blank" class="nav-more">查看项目</a>
+      
+    </div>
+    <div class="tab-container">
+      <div class="content unicode" style="display: block;">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe609;</span>
+                <div class="name">yunshuguanli</div>
+                <div class="code-name">&amp;#xe609;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe601;</span>
+                <div class="name">hetong</div>
+                <div class="code-name">&amp;#xe601;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe602;</span>
+                <div class="name">index</div>
+                <div class="code-name">&amp;#xe602;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe603;</span>
+                <div class="name">shouqi</div>
+                <div class="code-name">&amp;#xe603;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe604;</span>
+                <div class="name">zhankai</div>
+                <div class="code-name">&amp;#xe604;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe606;</span>
+                <div class="name">cangku</div>
+                <div class="code-name">&amp;#xe606;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe607;</span>
+                <div class="name">renwuguanli</div>
+                <div class="code-name">&amp;#xe607;</div>
+              </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="unicode-">Unicode 引用</h2>
+          <hr>
+
+          <p>Unicode 是字体在网页端最原始的应用方式,特点是:</p>
+          <ul>
+            <li>支持按字体的方式去动态调整图标大小,颜色等等。</li>
+            <li>默认情况下不支持多色,直接添加多色图标会自动去色。</li>
+          </ul>
+          <blockquote>
+            <p>注意:新版 iconfont 支持两种方式引用多色图标:SVG symbol 引用方式和彩色字体图标模式。(使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。)</p>
+          </blockquote>
+          <p>Unicode 使用步骤如下:</p>
+          <h3 id="-font-face">第一步:拷贝项目下面生成的 <code>@font-face</code></h3>
+<pre><code class="language-css"
+>@font-face {
+  font-family: 'iconfont';
+  src: url('iconfont.woff2?t=1625617801377') format('woff2'),
+       url('iconfont.woff?t=1625617801377') format('woff'),
+       url('iconfont.ttf?t=1625617801377') format('truetype');
+}
+</code></pre>
+          <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
+<pre><code class="language-css"
+>.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+</code></pre>
+          <h3 id="-">第三步:挑选相应图标并获取字体编码,应用于页面</h3>
+<pre>
+<code class="language-html"
+>&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
+</code></pre>
+          <blockquote>
+            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看,默认是 "iconfont"。</p>
+          </blockquote>
+          </div>
+      </div>
+      <div class="content font-class">
+        <ul class="icon_lists dib-box">
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yunshu2"></span>
+            <div class="name">
+              yunshuguanli
+            </div>
+            <div class="code-name">.icon-yunshu2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-hetongguanli"></span>
+            <div class="name">
+              hetong
+            </div>
+            <div class="code-name">.icon-hetongguanli
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-index-copy"></span>
+            <div class="name">
+              index
+            </div>
+            <div class="code-name">.icon-index-copy
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shouqi"></span>
+            <div class="name">
+              shouqi
+            </div>
+            <div class="code-name">.icon-shouqi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-zhankai"></span>
+            <div class="name">
+              zhankai
+            </div>
+            <div class="code-name">.icon-zhankai
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-cangkubeifen"></span>
+            <div class="name">
+              cangku
+            </div>
+            <div class="code-name">.icon-cangkubeifen
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-renwuguanli"></span>
+            <div class="name">
+              renwuguanli
+            </div>
+            <div class="code-name">.icon-renwuguanli
+            </div>
+          </li>
+          
+        </ul>
+        <div class="article markdown">
+        <h2 id="font-class-">font-class 引用</h2>
+        <hr>
+
+        <p>font-class 是 Unicode 使用方式的一种变种,主要是解决 Unicode 书写不直观,语意不明确的问题。</p>
+        <p>与 Unicode 使用方式相比,具有如下特点:</p>
+        <ul>
+          <li>相比于 Unicode 语意明确,书写更直观。可以很容易分辨这个 icon 是什么。</li>
+          <li>因为使用 class 来定义图标,所以当要替换图标时,只需要修改 class 里面的 Unicode 引用。</li>
+        </ul>
+        <p>使用步骤如下:</p>
+        <h3 id="-fontclass-">第一步:引入项目下面生成的 fontclass 代码:</h3>
+<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+</code></pre>
+        <h3 id="-">第二步:挑选相应图标并获取类名,应用于页面:</h3>
+<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
+</code></pre>
+        <blockquote>
+          <p>"
+            iconfont" 是你项目下的 font-family。可以通过编辑项目查看,默认是 "iconfont"。</p>
+        </blockquote>
+      </div>
+      </div>
+      <div class="content symbol">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yunshu2"></use>
+                </svg>
+                <div class="name">yunshuguanli</div>
+                <div class="code-name">#icon-yunshu2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-hetongguanli"></use>
+                </svg>
+                <div class="name">hetong</div>
+                <div class="code-name">#icon-hetongguanli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-index-copy"></use>
+                </svg>
+                <div class="name">index</div>
+                <div class="code-name">#icon-index-copy</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shouqi"></use>
+                </svg>
+                <div class="name">shouqi</div>
+                <div class="code-name">#icon-shouqi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zhankai"></use>
+                </svg>
+                <div class="name">zhankai</div>
+                <div class="code-name">#icon-zhankai</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-cangkubeifen"></use>
+                </svg>
+                <div class="name">cangku</div>
+                <div class="code-name">#icon-cangkubeifen</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-renwuguanli"></use>
+                </svg>
+                <div class="name">renwuguanli</div>
+                <div class="code-name">#icon-renwuguanli</div>
+            </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="symbol-">Symbol 引用</h2>
+          <hr>
+
+          <p>这是一种全新的使用方式,应该说这才是未来的主流,也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
+            这种用法其实是做了一个 SVG 的集合,与另外两种相比具有如下特点:</p>
+          <ul>
+            <li>支持多色图标了,不再受单色限制。</li>
+            <li>通过一些技巧,支持像字体那样,通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
+            <li>兼容性较差,支持 IE9+,及现代浏览器。</li>
+            <li>浏览器渲染 SVG 的性能一般,还不如 png。</li>
+          </ul>
+          <p>使用步骤如下:</p>
+          <h3 id="-symbol-">第一步:引入项目下面生成的 symbol 代码:</h3>
+<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+</code></pre>
+          <h3 id="-css-">第二步:加入通用 CSS 代码(引入一次就行):</h3>
+<pre><code class="language-html">&lt;style&gt;
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+&lt;/style&gt;
+</code></pre>
+          <h3 id="-">第三步:挑选相应图标并获取类名,应用于页面:</h3>
+<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
+&lt;/svg&gt;
+</code></pre>
+          </div>
+      </div>
+
+    </div>
+  </div>
+  <script>
+  $(document).ready(function () {
+      $('.tab-container .content:first').show()
+
+      $('#tabs li').click(function (e) {
+        var tabContent = $('.tab-container .content')
+        var index = $(this).index()
+
+        if ($(this).hasClass('active')) {
+          return
+        } else {
+          $('#tabs li').removeClass('active')
+          $(this).addClass('active')
+
+          tabContent.hide().eq(index).fadeIn()
+        }
+      })
+    })
+  </script>
+</body>
+</html>

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 3
public/static/iconfont/iconfont.css


BIN
public/static/iconfont/iconfont.eot


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
public/static/iconfont/iconfont.js


+ 58 - 0
public/static/iconfont/iconfont.json

@@ -0,0 +1,58 @@
+{
+  "id": "2554236",
+  "name": "易粮易运",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "22711544",
+      "name": "yunshuguanli",
+      "font_class": "yunshu2",
+      "unicode": "e609",
+      "unicode_decimal": 58889
+    },
+    {
+      "icon_id": "22700427",
+      "name": "hetong",
+      "font_class": "hetongguanli",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "22700497",
+      "name": "index",
+      "font_class": "index-copy",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
+    {
+      "icon_id": "22700554",
+      "name": "shouqi",
+      "font_class": "shouqi",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    },
+    {
+      "icon_id": "22700576",
+      "name": "zhankai",
+      "font_class": "zhankai",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "22700607",
+      "name": "cangku",
+      "font_class": "cangkubeifen",
+      "unicode": "e606",
+      "unicode_decimal": 58886
+    },
+    {
+      "icon_id": "22700672",
+      "name": "renwuguanli",
+      "font_class": "renwuguanli",
+      "unicode": "e607",
+      "unicode_decimal": 58887
+    }
+  ]
+}

BIN
public/static/iconfont/iconfont.ttf


BIN
public/static/iconfont/iconfont.woff


BIN
public/static/iconfont/iconfont.woff2


+ 539 - 0
public/static/sidebar/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;
+}

+ 349 - 0
public/static/sidebar/demo_index.html

@@ -0,0 +1,349 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>iconfont Demo</title>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
+  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
+  <link rel="stylesheet" href="demo.css">
+  <link rel="stylesheet" href="iconfont.css">
+  <script src="iconfont.js"></script>
+  <!-- jQuery -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
+  <!-- 代码高亮 -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
+    <div class="nav-tabs">
+      <ul id="tabs" class="dib-box">
+        <li class="dib active"><span>Unicode</span></li>
+        <li class="dib"><span>Font class</span></li>
+        <li class="dib"><span>Symbol</span></li>
+      </ul>
+      
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=2554236" target="_blank" class="nav-more">查看项目</a>
+      
+    </div>
+    <div class="tab-container">
+      <div class="content unicode" style="display: block;">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe601;</span>
+                <div class="name">hetong</div>
+                <div class="code-name">&amp;#xe601;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe602;</span>
+                <div class="name">index</div>
+                <div class="code-name">&amp;#xe602;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe603;</span>
+                <div class="name">shouqi</div>
+                <div class="code-name">&amp;#xe603;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe604;</span>
+                <div class="name">zhankai</div>
+                <div class="code-name">&amp;#xe604;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe605;</span>
+                <div class="name">yunshu</div>
+                <div class="code-name">&amp;#xe605;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe606;</span>
+                <div class="name">cangku</div>
+                <div class="code-name">&amp;#xe606;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe607;</span>
+                <div class="name">renwuguanli</div>
+                <div class="code-name">&amp;#xe607;</div>
+              </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="unicode-">Unicode 引用</h2>
+          <hr>
+
+          <p>Unicode 是字体在网页端最原始的应用方式,特点是:</p>
+          <ul>
+            <li>支持按字体的方式去动态调整图标大小,颜色等等。</li>
+            <li>默认情况下不支持多色,直接添加多色图标会自动去色。</li>
+          </ul>
+          <blockquote>
+            <p>注意:新版 iconfont 支持两种方式引用多色图标:SVG symbol 引用方式和彩色字体图标模式。(使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。)</p>
+          </blockquote>
+          <p>Unicode 使用步骤如下:</p>
+          <h3 id="-font-face">第一步:拷贝项目下面生成的 <code>@font-face</code></h3>
+<pre><code class="language-css"
+>@font-face {
+  font-family: 'iconfont';
+  src: url('iconfont.woff2?t=1625559958046') format('woff2'),
+       url('iconfont.woff?t=1625559958046') format('woff'),
+       url('iconfont.ttf?t=1625559958046') format('truetype');
+}
+</code></pre>
+          <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
+<pre><code class="language-css"
+>.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+</code></pre>
+          <h3 id="-">第三步:挑选相应图标并获取字体编码,应用于页面</h3>
+<pre>
+<code class="language-html"
+>&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
+</code></pre>
+          <blockquote>
+            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看,默认是 "iconfont"。</p>
+          </blockquote>
+          </div>
+      </div>
+      <div class="content font-class">
+        <ul class="icon_lists dib-box">
+          
+          <li class="dib">
+            <span class="icon iconfont icon-hetongguanli"></span>
+            <div class="name">
+              hetong
+            </div>
+            <div class="code-name">.icon-hetongguanli
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-index-copy"></span>
+            <div class="name">
+              index
+            </div>
+            <div class="code-name">.icon-index-copy
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shouqi"></span>
+            <div class="name">
+              shouqi
+            </div>
+            <div class="code-name">.icon-shouqi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-zhankai"></span>
+            <div class="name">
+              zhankai
+            </div>
+            <div class="code-name">.icon-zhankai
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yunshu"></span>
+            <div class="name">
+              yunshu
+            </div>
+            <div class="code-name">.icon-yunshu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-cangkubeifen"></span>
+            <div class="name">
+              cangku
+            </div>
+            <div class="code-name">.icon-cangkubeifen
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-renwuguanli"></span>
+            <div class="name">
+              renwuguanli
+            </div>
+            <div class="code-name">.icon-renwuguanli
+            </div>
+          </li>
+          
+        </ul>
+        <div class="article markdown">
+        <h2 id="font-class-">font-class 引用</h2>
+        <hr>
+
+        <p>font-class 是 Unicode 使用方式的一种变种,主要是解决 Unicode 书写不直观,语意不明确的问题。</p>
+        <p>与 Unicode 使用方式相比,具有如下特点:</p>
+        <ul>
+          <li>相比于 Unicode 语意明确,书写更直观。可以很容易分辨这个 icon 是什么。</li>
+          <li>因为使用 class 来定义图标,所以当要替换图标时,只需要修改 class 里面的 Unicode 引用。</li>
+        </ul>
+        <p>使用步骤如下:</p>
+        <h3 id="-fontclass-">第一步:引入项目下面生成的 fontclass 代码:</h3>
+<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+</code></pre>
+        <h3 id="-">第二步:挑选相应图标并获取类名,应用于页面:</h3>
+<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
+</code></pre>
+        <blockquote>
+          <p>"
+            iconfont" 是你项目下的 font-family。可以通过编辑项目查看,默认是 "iconfont"。</p>
+        </blockquote>
+      </div>
+      </div>
+      <div class="content symbol">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-hetongguanli"></use>
+                </svg>
+                <div class="name">hetong</div>
+                <div class="code-name">#icon-hetongguanli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-index-copy"></use>
+                </svg>
+                <div class="name">index</div>
+                <div class="code-name">#icon-index-copy</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shouqi"></use>
+                </svg>
+                <div class="name">shouqi</div>
+                <div class="code-name">#icon-shouqi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zhankai"></use>
+                </svg>
+                <div class="name">zhankai</div>
+                <div class="code-name">#icon-zhankai</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yunshu"></use>
+                </svg>
+                <div class="name">yunshu</div>
+                <div class="code-name">#icon-yunshu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-cangkubeifen"></use>
+                </svg>
+                <div class="name">cangku</div>
+                <div class="code-name">#icon-cangkubeifen</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-renwuguanli"></use>
+                </svg>
+                <div class="name">renwuguanli</div>
+                <div class="code-name">#icon-renwuguanli</div>
+            </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="symbol-">Symbol 引用</h2>
+          <hr>
+
+          <p>这是一种全新的使用方式,应该说这才是未来的主流,也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
+            这种用法其实是做了一个 SVG 的集合,与另外两种相比具有如下特点:</p>
+          <ul>
+            <li>支持多色图标了,不再受单色限制。</li>
+            <li>通过一些技巧,支持像字体那样,通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
+            <li>兼容性较差,支持 IE9+,及现代浏览器。</li>
+            <li>浏览器渲染 SVG 的性能一般,还不如 png。</li>
+          </ul>
+          <p>使用步骤如下:</p>
+          <h3 id="-symbol-">第一步:引入项目下面生成的 symbol 代码:</h3>
+<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+</code></pre>
+          <h3 id="-css-">第二步:加入通用 CSS 代码(引入一次就行):</h3>
+<pre><code class="language-html">&lt;style&gt;
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+&lt;/style&gt;
+</code></pre>
+          <h3 id="-">第三步:挑选相应图标并获取类名,应用于页面:</h3>
+<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
+&lt;/svg&gt;
+</code></pre>
+          </div>
+      </div>
+
+    </div>
+  </div>
+  <script>
+  $(document).ready(function () {
+      $('.tab-container .content:first').show()
+
+      $('#tabs li').click(function (e) {
+        var tabContent = $('.tab-container .content')
+        var index = $(this).index()
+
+        if ($(this).hasClass('active')) {
+          return
+        } else {
+          $('#tabs li').removeClass('active')
+          $(this).addClass('active')
+
+          tabContent.hide().eq(index).fadeIn()
+        }
+      })
+    })
+  </script>
+</body>
+</html>

+ 43 - 0
public/static/sidebar/iconfont.css

@@ -0,0 +1,43 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 2554236 */
+  src: url('iconfont.woff2?t=1625559958046') format('woff2'),
+       url('iconfont.woff?t=1625559958046') format('woff'),
+       url('iconfont.ttf?t=1625559958046') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-hetongguanli:before {
+  content: "\e601";
+}
+
+.icon-index-copy:before {
+  content: "\e602";
+}
+
+.icon-shouqi:before {
+  content: "\e603";
+}
+
+.icon-zhankai:before {
+  content: "\e604";
+}
+
+.icon-yunshu:before {
+  content: "\e605";
+}
+
+.icon-cangkubeifen:before {
+  content: "\e606";
+}
+
+.icon-renwuguanli:before {
+  content: "\e607";
+}
+

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
public/static/sidebar/iconfont.js


+ 58 - 0
public/static/sidebar/iconfont.json

@@ -0,0 +1,58 @@
+{
+  "id": "2554236",
+  "name": "易粮易运",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "22700427",
+      "name": "hetong",
+      "font_class": "hetongguanli",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "22700497",
+      "name": "index",
+      "font_class": "index-copy",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
+    {
+      "icon_id": "22700554",
+      "name": "shouqi",
+      "font_class": "shouqi",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    },
+    {
+      "icon_id": "22700576",
+      "name": "zhankai",
+      "font_class": "zhankai",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "22700585",
+      "name": "yunshu",
+      "font_class": "yunshu",
+      "unicode": "e605",
+      "unicode_decimal": 58885
+    },
+    {
+      "icon_id": "22700607",
+      "name": "cangku",
+      "font_class": "cangkubeifen",
+      "unicode": "e606",
+      "unicode_decimal": 58886
+    },
+    {
+      "icon_id": "22700672",
+      "name": "renwuguanli",
+      "font_class": "renwuguanli",
+      "unicode": "e607",
+      "unicode_decimal": 58887
+    }
+  ]
+}

BIN
public/static/sidebar/iconfont.ttf


BIN
public/static/sidebar/iconfont.woff


BIN
public/static/sidebar/iconfont.woff2


+ 2 - 0
src/lang/zh.js

@@ -521,6 +521,7 @@
     tranManagementWarehouseInOutTask: '出入库任务',
     tranManagementWarehouseInOutTask: '出入库任务',
     tranManagementWarehouseInOutTaskAdd: '出入库任务添加',
     tranManagementWarehouseInOutTaskAdd: '出入库任务添加',
     tranManagementWarehouseInOutTaskEdit:'编辑',
     tranManagementWarehouseInOutTaskEdit:'编辑',
+    tranManagementWarehouseInOutTaskaudit:'审核',
     tranManagementVehicle: '汽运调度',
     tranManagementVehicle: '汽运调度',
     tranManagementVehicleDispatching: '汽车调度',
     tranManagementVehicleDispatching: '汽车调度',
     tranManagementVehicleLook: '查看派车详情',
     tranManagementVehicleLook: '查看派车详情',
@@ -4783,6 +4784,7 @@
   // 任务管理
   // 任务管理
   taskManagement: '任务管理',
   taskManagement: '任务管理',
   tranManagementWarehouseInOutTaskEdit:'编辑',
   tranManagementWarehouseInOutTaskEdit:'编辑',
+  tranManagementWarehouseInOutTaskaudit:'审核',
   // moveWarehouseTask :'移库任务',
   // moveWarehouseTask :'移库任务',
   // 年度培训
   // 年度培训
   annualTraining: {
   annualTraining: {

+ 4 - 3
src/layout/index/logo.vue

@@ -12,9 +12,7 @@
         <span class="winseaview-logo_title"
         <span class="winseaview-logo_title"
               key="1">
               key="1">
           <div>
           <div>
-            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-yiliangyiyun"></use>
-            </svg>
+            <i class="iconfont icon-yiliangyiyun"></i>
           </div>
           </div>
         </span>
         </span>
       </template>
       </template>
@@ -36,6 +34,9 @@ export default {
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
+.icon-yiliangyiyun{
+  font-size:40px;
+}
 .icon {
 .icon {
   width: 9em;
   width: 9em;
   height: 3em;
   height: 3em;

+ 1 - 0
src/layout/index/sidebar/sidebarItem.vue

@@ -54,6 +54,7 @@
 import { mapGetters } from 'vuex'
 import { mapGetters } from 'vuex'
 import { validatenull } from '@/utils/validate'
 import { validatenull } from '@/utils/validate'
 import config from './config.js'
 import config from './config.js'
+import '../../../../public/static/sidebar/iconfont.css'
 import { getValue, generateTitle, getPath } from '@/utils/util'
 import { getValue, generateTitle, getPath } from '@/utils/util'
 export default {
 export default {
   name: 'sidebarItem',
   name: 'sidebarItem',

+ 1 - 1
src/layout/index/top/index.vue

@@ -6,7 +6,7 @@
         class="winseaview-breadcrumb"
         class="winseaview-breadcrumb"
         :class="[{ 'winseaview-breadcrumb--active': isCollapse }]"
         :class="[{ 'winseaview-breadcrumb--active': isCollapse }]"
       >
       >
-        <i class="iconfont iconasideShowy" @click="setCollapse"></i>
+        <i class="iconfont icon-shouqi" @click="setCollapse"></i>
       </div>
       </div>
       <!-- </div>
       <!-- </div>
     <div class="top-bar__title"> -->
     <div class="top-bar__title"> -->

+ 2 - 2
src/router/index.js

@@ -67,13 +67,13 @@ export const constantRoutes = [
     path: '/',
     path: '/',
     component: Layout,
     component: Layout,
     redirect: { name: 'home' },
     redirect: { name: 'home' },
-    meta: { title: 'home', icon: 'home' },
+    meta: { title: 'home', icon: '-index-copy' },
     children: [
     children: [
       {
       {
         path: 'home',
         path: 'home',
         component: () => page('home'),
         component: () => page('home'),
         name: 'home',
         name: 'home',
-        meta: { title: 'home', icon: 'home', affix: true, auth: 'homePage' },
+        meta: { title: 'home', icon: '-index-copy', affix: true, auth: 'homePage' },
         hidden: true
         hidden: true
       }
       }
     ]
     ]

+ 1 - 1
src/views/contractManagement/component/routers/route.js

@@ -9,7 +9,7 @@ const contractManagementRouter = {
   meta: {
   meta: {
     title: 'contractManagement',
     title: 'contractManagement',
     module: 'contractManagement',
     module: 'contractManagement',
-    icon: 'cg'
+    icon: '-hetongguanli'
   },
   },
   children: [
   children: [
     {
     {

+ 17 - 2
src/views/taskManagement/component/routers/route.js

@@ -10,7 +10,7 @@ const tranManagementRouter = {
   meta: {
   meta: {
     title: 'taskManagement',
     title: 'taskManagement',
     module: 'transportationTask',
     module: 'transportationTask',
-    icon: 'cg'
+    icon: '-renwuguanli'
   },
   },
   children: [
   children: [
     //运输任务
     //运输任务
@@ -89,7 +89,7 @@ const tranManagementRouter = {
         keepAlive: true
         keepAlive: true
       },
       },
     },
     },
-    //移库查看
+    //移库查看 
     {
     {
       path: 'moveWarehouseTaskLook',
       path: 'moveWarehouseTaskLook',
       component: () =>
       component: () =>
@@ -159,6 +159,21 @@ const tranManagementRouter = {
       },
       },
       hidden: true
       hidden: true
     },
     },
+    //出入库任务审核
+    {
+      path: 'tranManagementWarehouseInOutTaskaudit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskEdit'),
+      name: 'tranManagementWarehouseInOutTaskEdit',
+      meta: {
+        title: 'tranManagementWarehouseInOutTaskaudit',
+        shortcutEntrance: 'tranManagement',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask.audit',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
 
 
   ],
   ],
 
 

+ 5 - 1
src/views/taskManagement/tranManagementLook.vue

@@ -29,7 +29,7 @@
             {{ deptBudgetList.taskNo }}
             {{ deptBudgetList.taskNo }}
           </ws-form-item>
           </ws-form-item>
           <!--合同编号-->
           <!--合同编号-->
-          <ws-form-item label="合同编号" span="1" prop="contractNo">
+          <ws-form-item label="合同编号/移库任务编号" span="1" prop="contractNo">
             {{ deptBudgetList.contractNo }}
             {{ deptBudgetList.contractNo }}
           </ws-form-item>
           </ws-form-item>
           <!--货名-->
           <!--货名-->
@@ -433,4 +433,8 @@ export default {
   font-size: 16px;
   font-size: 16px;
   color: #69708c;
   color: #69708c;
 }
 }
+.el-form{
+      height: 73vh;
+    overflow: scroll;
+}
 </style>
 </style>

+ 3 - 1
src/views/taskManagement/tranManagementTransport.vue

@@ -48,7 +48,7 @@
         <span style="width: 142px; display: inline-block;color: #8890B1;">终点:</span>
         <span style="width: 142px; display: inline-block;color: #8890B1;">终点:</span>
         <el-input label="终点" placeholder="请输入终点" clearable maxlength="200" type="input"></el-input>
         <el-input label="终点" placeholder="请输入终点" clearable maxlength="200" type="input"></el-input>
         <el-input
         <el-input
-          v-model="warehouseName"
+          v-model="searchKeyWord"
           placeholder="可按合同编号或运输任务编号查找"
           placeholder="可按合同编号或运输任务编号查找"
           clearable
           clearable
           maxlength="500"
           maxlength="500"
@@ -282,6 +282,8 @@ export default {
         currentPage: this.currentPage,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         pageSize: this.pageSize,
         searchType: this.searchType,
         searchType: this.searchType,
+        start:this.start,
+        end:this.end,
         searchKeyWord: this.searchKeyWord
         searchKeyWord: this.searchKeyWord
       })
       })
         .toPromise()
         .toPromise()

+ 95 - 27
src/views/taskManagement/tranManagementTransportAdd.vue

@@ -39,7 +39,6 @@
           <el-select
           <el-select
             v-model="deptBudgetList.taskType"
             v-model="deptBudgetList.taskType"
             placeholder="请输入任务类型"
             placeholder="请输入任务类型"
-            class="typeselect"
             @change="selecttaskType"
             @change="selecttaskType"
           >
           >
             <el-option
             <el-option
@@ -50,11 +49,10 @@
             ></el-option>
             ></el-option>
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
-        <el-form-item prop="contractNo" label="合同编号" span="1">
+        <el-form-item prop="contractNo" label="合同编号/移库任务编号" span="1">
           <el-select
           <el-select
             v-model="deptBudgetList.contractNo"
             v-model="deptBudgetList.contractNo"
-            placeholder="请输入合同编号"
-            class="typeselect"
+            placeholder="请选择编号"
           >
           >
             <el-option
             <el-option
               v-for="item in contractNoList"
               v-for="item in contractNoList"
@@ -68,7 +66,6 @@
           <el-select
           <el-select
             v-model="deptBudgetList.goodsName"
             v-model="deptBudgetList.goodsName"
             placeholder="请输入货名"
             placeholder="请输入货名"
-            class="typeselect"
             @change="selectgoodsname"
             @change="selectgoodsname"
           >
           >
             <el-option
             <el-option
@@ -81,6 +78,7 @@
         </el-form-item>
         </el-form-item>
         <el-form-item label="重量(吨)" span="1" prop="weight">
         <el-form-item label="重量(吨)" span="1" prop="weight">
           <el-input
           <el-input
+          @input='weightchange'
             v-model="deptBudgetList.weight"
             v-model="deptBudgetList.weight"
             placeholder="请输入重量"
             placeholder="请输入重量"
             maxlength="20"
             maxlength="20"
@@ -90,13 +88,16 @@
       </ws-info-table>
       </ws-info-table>
       <ws-info-table class="el-table">
       <ws-info-table class="el-table">
         <div class="start-address" style="width : 36%">
         <div class="start-address" style="width : 36%">
-          <el-radio v-model="deptBudgetList.warehouseType" label="1"
+          <el-radio-group @change='warehouseTypechange' v-model="deptBudgetList.warehouseType">
+          <el-radio label="1"
             >常用仓库发货</el-radio
             >常用仓库发货</el-radio
           >
           >
-          <el-radio v-model="deptBudgetList.warehouseType" label="2"
+          <el-radio label="2"
             >临时仓库发货</el-radio
             >临时仓库发货</el-radio
           >
           >
+          </el-radio-group>
           <el-select
           <el-select
+          @change='sendWarehousechange'
             v-model="deptBudgetList.sendWarehouse"
             v-model="deptBudgetList.sendWarehouse"
             placeholder="选择仓库"
             placeholder="选择仓库"
             class="typeselect"
             class="typeselect"
@@ -143,7 +144,6 @@
             v-model="deptBudgetList.receiveWarehouse"
             v-model="deptBudgetList.receiveWarehouse"
             :disabled="warehouse"
             :disabled="warehouse"
             placeholder="请输入收货库点"
             placeholder="请输入收货库点"
-            class="typeselect"
             style="width: 100%"
             style="width: 100%"
           >
           >
             <el-option
             <el-option
@@ -199,12 +199,12 @@
         :key="index"
         :key="index"
       >
       >
         <div class="driver">
         <div class="driver">
-          <span >运输阶段{{ index + 1 }} {{ item.processNo }}</span>
-          <img
+          <span style='vertical-align: top;'>运输阶段{{ index + 1 }} {{ item.processNo }}</span>
+          <img v-if='!endflag'
             width="22"
             width="22"
             height="22"
             height="22"
             class="add"
             class="add"
-            @click="add"
+            @click="add(index)"
             src="../../../public/img/add.png"
             src="../../../public/img/add.png"
             alt=""
             alt=""
           />
           />
@@ -216,26 +216,20 @@
             src="../../../public/img/del.png"
             src="../../../public/img/del.png"
             alt=""
             alt=""
           />
           />
-          <span style="margin-left : 20px;font-size : 14px"  v-if="index == deptBudgetList.tranProcessInfoList.length - 1">最终阶段</span>
           <el-checkbox
           <el-checkbox
+          @change='engflagchange'
+           class='endflag'
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
             v-model="item.endFlag"
             v-model="item.endFlag"
             :label="1"
             :label="1"
-            ></el-checkbox
-          >  
-          <el-checkbox
-            v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
-            v-model="item.endFlag"
-            :label="2"
-            ></el-checkbox
-          >        
+            >最终阶段</el-checkbox
+          >     
         </div>
         </div>
         <ws-info-table>
         <ws-info-table>
           <el-form-item label="运输方式" span="1" prop="waterContent">
           <el-form-item label="运输方式" span="1" prop="waterContent">
             <el-select
             <el-select
               v-model="item.tranType"
               v-model="item.tranType"
               placeholder="运输方式"
               placeholder="运输方式"
-              class="typeselect"
               @change="
               @change="
                 (val) => {
                 (val) => {
                   selecttaskwayList(val, index)
                   selecttaskwayList(val, index)
@@ -398,6 +392,7 @@ export default {
   data() {
   data() {
     let self = this
     let self = this
     return {
     return {
+      flag:2,
       checkList: [],
       checkList: [],
       deptBudgetList: {
       deptBudgetList: {
         taskNo: '',
         taskNo: '',
@@ -435,6 +430,7 @@ export default {
       options_: regionData,
       options_: regionData,
       heightData: '600px',
       heightData: '600px',
       zoom: 7,
       zoom: 7,
+      endflag:false,
       selectedOptions: [],
       selectedOptions: [],
       selectedOptions1: [],
       selectedOptions1: [],
       window: '',
       window: '',
@@ -481,6 +477,35 @@ export default {
     },
     },
   },
   },
   methods: {
   methods: {
+    sendWarehousechange(e){
+      for (let i = 0; i < this.warehouseList.length; i++) {
+        if(this.warehouseList[i].warehouseName==e){
+          var tmp=[]
+          tmp[0]=TextToCode[this.warehouseList[i].warehousePrivate].code
+          tmp[1]=TextToCode[this.warehouseList[i].warehousePrivate][this.warehouseList[i].warehouseCity].code
+          tmp[2]=TextToCode[this.warehouseList[i].warehousePrivate][this.warehouseList[i].warehouseCity][this.warehouseList[i].warehouseArea].code
+          this.selectedOptions=tmp
+          this.deptBudgetList.tranProcessInfoList[0].selectedOptions=tmp
+          this.deptBudgetList.startDetailedAddress=this.warehouseList[i].detailedAddress
+        }
+      }
+    },
+    warehouseTypechange(){
+        getwarehousename({
+        compId: this.compId,
+        warehouseType: this.deptBudgetList.warehouseType,
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList = response
+        })
+    },
+    weightchange(e){
+      this.deptBudgetList.tranProcessInfoList[0].weight=e
+    },
+    engflagchange(e){
+      this.endflag=e
+    },
     // 获取当前年月日
     // 获取当前年月日
     getdate() {
     getdate() {
       var date = new Date()
       var date = new Date()
@@ -512,6 +537,7 @@ export default {
     },
     },
     loaddata() {
     loaddata() {
       this.deptBudgetList.taskNo = 'YS' + this.getdate() + this.verifyinit()
       this.deptBudgetList.taskNo = 'YS' + this.getdate() + this.verifyinit()
+      this.deptBudgetList.tranProcessInfoList[0].processNo=this.deptBudgetList.taskNo+'-1'
       // 货名
       // 货名
       packList({ constId: 'CON2' })
       packList({ constId: 'CON2' })
         .toPromise()
         .toPromise()
@@ -541,6 +567,7 @@ export default {
         })
         })
       xialaNo({
       xialaNo({
         compId: this.compId,
         compId: this.compId,
+        flag: this.flag
       })
       })
         .toPromise()
         .toPromise()
         .then((response) => {
         .then((response) => {
@@ -555,13 +582,15 @@ export default {
     handleClose() {
     handleClose() {
       this.dialogViewSpareMoney = false
       this.dialogViewSpareMoney = false
     },
     },
-    add() {
+    add(index) {
+      console.log(index)
       this.deptBudgetList.tranProcessInfoList.push({
       this.deptBudgetList.tranProcessInfoList.push({
+        processNo: this.deptBudgetList.taskNo+'-'+(index+2),
         tranType: '汽运',
         tranType: '汽运',
         tranTypeKey: '1',
         tranTypeKey: '1',
         deliveryDateStart: '',
         deliveryDateStart: '',
         deliveryDateEnd: '',
         deliveryDateEnd: '',
-        weight: '',
+        weight: this.deptBudgetList.tranProcessInfoList[this.deptBudgetList.tranProcessInfoList.length-1].weight,
         selectedOptions: [],
         selectedOptions: [],
         selectedOptions1: [],
         selectedOptions1: [],
         sendPrivate: '',
         sendPrivate: '',
@@ -614,6 +643,36 @@ export default {
     },
     },
     returnsales() {
     returnsales() {
       this.$router.push({ path: 'tranManagementTransport' })
       this.$router.push({ path: 'tranManagementTransport' })
+      this.deptBudgetList = {
+                taskNo: '',
+                totalStorage: 0,
+                goodsName: '玉米',
+                goodsNameKey: 1,
+                warehouseType: '1',
+                tranProcessInfoList: [
+                  {
+                    processNo: '',
+                    tranType: '汽运',
+                    deliveryDateStart: '',
+                    deliveryDateEnd: '',
+                    weight: '',
+                    selectedOptions: [],
+                    selectedOptions1: [],
+                    sendPrivate: '',
+                    sendCity: '',
+                    sendArea: '',
+                    receivePrivate: '',
+                    receiveCity: '',
+                    receiveArea: '',
+                    sendDetailedAddress: '',
+                    receiveDetailedAddress: '',
+                    sender: '',
+                    receiver: '',
+                    senderPhone: '',
+                    receiverPhone: '',
+                  },
+                ],
+              }
     },
     },
     selecttaskType(e) {
     selecttaskType(e) {
       for (var i = 0; i < this.taskType.length; i++) {
       for (var i = 0; i < this.taskType.length; i++) {
@@ -729,6 +788,10 @@ export default {
   font-size: 14px;
   font-size: 14px;
   color: #8890b1;
   color: #8890b1;
 }
 }
+.typeselect{
+  width:42%;
+  margin-left:32px;
+}
 .del,
 .del,
 .add {
 .add {
   cursor: pointer;
   cursor: pointer;
@@ -781,7 +844,9 @@ export default {
 .el-form {
 .el-form {
   margin-top: 50px;
   margin-top: 50px;
 }
 }
-
+.endflag{
+  vertical-align: top;
+}
 .el-col {
 .el-col {
   background: #f6f7fc;
   background: #f6f7fc;
 }
 }
@@ -824,6 +889,9 @@ export default {
     }
     }
   }
   }
 }
 }
+/deep/.el-table--border:after, /deep/.el-table--group:after, /deep/.el-table:before {
+  background:transparent;
+}
 //输入框标题
 //输入框标题
 /deep/.ws-info-table .el-form-item .el-form-item__label {
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background: #ffffff;
   background: #ffffff;
@@ -853,8 +921,8 @@ export default {
 .el-cascader {
 .el-cascader {
   width: 100%;
   width: 100%;
 }
 }
-.container {
-  overflow: scroll;
-  height: 93vh;
+.el-form{
+      height: 73vh;
+    overflow: scroll;
 }
 }
 </style>
 </style>

+ 61 - 24
src/views/taskManagement/tranManagementTransportEdit.vue

@@ -38,8 +38,7 @@
         <el-form-item prop="taskType" label="任务类型" span="1">
         <el-form-item prop="taskType" label="任务类型" span="1">
           <el-select
           <el-select
             v-model="deptBudgetList.taskType"
             v-model="deptBudgetList.taskType"
-            placeholder=""
-            class="typeselect"
+            placeholder="请输入任务类型"
             @change="selecttaskType"
             @change="selecttaskType"
           >
           >
             <el-option
             <el-option
@@ -50,11 +49,10 @@
             ></el-option>
             ></el-option>
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
-        <el-form-item prop="contractNo" label="合同编号" span="1">
+        <el-form-item prop="contractNo" label="合同编号/移库任务编号" span="1">
           <el-select
           <el-select
             v-model="deptBudgetList.contractNo"
             v-model="deptBudgetList.contractNo"
-            placeholder="请输入合同编号"
-            class="typeselect"
+            placeholder="请选择编号"
           >
           >
             <el-option
             <el-option
               v-for="item in contractNoList"
               v-for="item in contractNoList"
@@ -67,8 +65,7 @@
         <el-form-item prop="goodsName" label="货名" span="1">
         <el-form-item prop="goodsName" label="货名" span="1">
           <el-select
           <el-select
             v-model="deptBudgetList.goodsName"
             v-model="deptBudgetList.goodsName"
-            placeholder="货名"
-            class="typeselect"
+            placeholder="请输入货名"
             @change="selectgoodsname"
             @change="selectgoodsname"
           >
           >
             <el-option
             <el-option
@@ -81,6 +78,7 @@
         </el-form-item>
         </el-form-item>
         <el-form-item label="重量(吨)" span="1" prop="weight">
         <el-form-item label="重量(吨)" span="1" prop="weight">
           <el-input
           <el-input
+          @input='weightchange'
             v-model="deptBudgetList.weight"
             v-model="deptBudgetList.weight"
             placeholder="请输入重量"
             placeholder="请输入重量"
             maxlength="20"
             maxlength="20"
@@ -89,13 +87,15 @@
         </el-form-item>
         </el-form-item>
       </ws-info-table>
       </ws-info-table>
       <ws-info-table class="el-table">
       <ws-info-table class="el-table">
-        <div class="start-address">
-          <el-radio v-model="deptBudgetList.warehouseType" label="1"
+        <div class="start-address" style="width : 36%">
+          <el-radio-group @change='warehouseTypechange' v-model="deptBudgetList.warehouseType">
+          <el-radio label="1"
             >常用仓库发货</el-radio
             >常用仓库发货</el-radio
           >
           >
-          <el-radio v-model="deptBudgetList.warehouseType" label="2"
+          <el-radio label="2"
             >临时仓库发货</el-radio
             >临时仓库发货</el-radio
           >
           >
+          </el-radio-group>
           <el-select
           <el-select
             v-model="deptBudgetList.sendWarehouse"
             v-model="deptBudgetList.sendWarehouse"
             placeholder="选择仓库"
             placeholder="选择仓库"
@@ -116,7 +116,6 @@
             clearable
             clearable
             size="large"
             size="large"
             placeholder="请选择始发地"
             placeholder="请选择始发地"
-            style="width: 200%"
             @change="handleChange"
             @change="handleChange"
           />
           />
         </el-form-item>
         </el-form-item>
@@ -138,12 +137,12 @@
           span="1"
           span="1"
           prop="contractNo"
           prop="contractNo"
           class="start-address"
           class="start-address"
-          style="width: 33.333%"
+          style="width: 36%"
         >
         >
           <el-select
           <el-select
             v-model="deptBudgetList.receiveWarehouse"
             v-model="deptBudgetList.receiveWarehouse"
+            :disabled="warehouse"
             placeholder="请输入收货库点"
             placeholder="请输入收货库点"
-            class="typeselect"
             style="width: 100%"
             style="width: 100%"
           >
           >
             <el-option
             <el-option
@@ -166,7 +165,6 @@
             clearable
             clearable
             size="large"
             size="large"
             placeholder="请选择终到地"
             placeholder="请选择终到地"
-            style="width: 200%"
             @change="handleChange1"
             @change="handleChange1"
           />
           />
         </el-form-item>
         </el-form-item>
@@ -197,14 +195,15 @@
         style="width: 100%"
         style="width: 100%"
         class="position"
         class="position"
         v-for="(item, index) in deptBudgetList.tranProcessInfoList"
         v-for="(item, index) in deptBudgetList.tranProcessInfoList"
+        :key="index"
       >
       >
         <div class="driver">
         <div class="driver">
-         运输阶段&nbsp;&nbsp;{{ index+1 }}&nbsp;&nbsp;({{ item.processNo }})
-          <img
+          <span style='vertical-align: top;'>运输阶段{{ index + 1 }} {{ item.processNo }}</span>
+          <img v-if='!endflag'
             width="22"
             width="22"
             height="22"
             height="22"
             class="add"
             class="add"
-            @click="add"
+            @click="add(index)"
             src="../../../public/img/add.png"
             src="../../../public/img/add.png"
             alt=""
             alt=""
           />
           />
@@ -216,13 +215,20 @@
             src="../../../public/img/del.png"
             src="../../../public/img/del.png"
             alt=""
             alt=""
           />
           />
+          <el-checkbox
+          @change='engflagchange'
+           class='endflag'
+            v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
+            v-model="item.endFlag"
+            :label="1"
+            >最终阶段</el-checkbox
+          >     
         </div>
         </div>
         <ws-info-table>
         <ws-info-table>
           <el-form-item label="运输方式" span="1" prop="waterContent">
           <el-form-item label="运输方式" span="1" prop="waterContent">
             <el-select
             <el-select
               v-model="item.tranType"
               v-model="item.tranType"
               placeholder="运输方式"
               placeholder="运输方式"
-              class="typeselect"
               @change="
               @change="
                 (val) => {
                 (val) => {
                   selecttaskwayList(val, index)
                   selecttaskwayList(val, index)
@@ -350,9 +356,12 @@
       </div>
       </div>
     </el-form>
     </el-form>
     <!-- 提交 -->
     <!-- 提交 -->
-    <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="submit(deptBudgetList)"
         >提交</el-button
         >提交</el-button
       >
       >
     </div>
     </div>
@@ -389,6 +398,7 @@ export default {
       checkList: [],
       checkList: [],
       deptBudgetList: {},
       deptBudgetList: {},
       radio: '1',
       radio: '1',
+      endflag:false,
       carModelList: [],
       carModelList: [],
       carLengthList: [],
       carLengthList: [],
       warehouseType: '1',
       warehouseType: '1',
@@ -427,6 +437,22 @@ export default {
     },
     },
   },
   },
   methods: {
   methods: {
+    warehouseTypechange(){
+        getwarehousename({
+        compId: this.compId,
+        warehouseType: this.deptBudgetList.warehouseType,
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList = response
+        })
+    },
+    weightchange(e){
+      this.deptBudgetList.tranProcessInfoList[0].weight=e
+    },
+    engflagchange(e){
+      this.endflag=e
+    },
     loaddata() {
     loaddata() {
       examinetran({ id: this.$route.query.id })
       examinetran({ id: this.$route.query.id })
         .toPromise()
         .toPromise()
@@ -496,7 +522,7 @@ export default {
         })
         })
       getwarehousename({
       getwarehousename({
         compId: this.compId,
         compId: this.compId,
-        warehouseType: this.warehouseType,
+        warehouseType: this.deptBudgetList.warehouseType,
       })
       })
         .toPromise()
         .toPromise()
         .then((response) => {
         .then((response) => {
@@ -640,6 +666,10 @@ export default {
 .position .ws-info-table .el-form-item {
 .position .ws-info-table .el-form-item {
   width: 25%;
   width: 25%;
 }
 }
+.typeselect{
+  width:42%;
+  margin-left:32px;
+}
 /deep/.position .ws-info-table .el-form-item .el-form-item__label,
 /deep/.position .ws-info-table .el-form-item .el-form-item__label,
 /deep/.position .ws-info-table .el-form-item .el-form-item__content {
 /deep/.position .ws-info-table .el-form-item .el-form-item__content {
   background: #f6f7fc;
   background: #f6f7fc;
@@ -661,12 +691,18 @@ export default {
 /deep/.el-checkbox__label {
 /deep/.el-checkbox__label {
   color: #8890b1;
   color: #8890b1;
 }
 }
+.el-form-item.start-address.el-form-item--small {
+  width: 31.9%;
+}
 .check-box {
 .check-box {
   margin-top: 10px;
   margin-top: 10px;
   margin-left: 16px;
   margin-left: 16px;
   color: #8890b1;
   color: #8890b1;
   font-size: 14px;
   font-size: 14px;
 }
 }
+/deep/.el-table--border:after, /deep/.el-table--group:after, /deep/.el-table:before {
+  background:transparent;
+}
 .el-form {
 .el-form {
   padding: 0 10%;
   padding: 0 10%;
 }
 }
@@ -700,9 +736,6 @@ export default {
 .el-form {
 .el-form {
   margin-top: 50px;
   margin-top: 50px;
 }
 }
-.el-form-item.start-address.el-form-item--small {
-  width: 33.3%;
-}
 .el-col {
 .el-col {
   background: #f6f7fc;
   background: #f6f7fc;
 }
 }
@@ -768,4 +801,8 @@ export default {
   font-size: 16px;
   font-size: 16px;
   color: #5473e8;
   color: #5473e8;
 }
 }
+.el-form{
+      height: 73vh;
+    overflow: scroll;
+}
 </style>
 </style>

+ 2 - 2
src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -181,7 +181,7 @@
               class="record"
               class="record"
               @click="nocomplete(scope.row)"
               @click="nocomplete(scope.row)"
               v-hasPermission="
               v-hasPermission="
-                `warehouseManagement.warehouse.warehouseInfoTask.view`
+                `warehouseManagement.warehouse.warehouseInfoTask.View`
               "
               "
             >
             >
               查看
               查看
@@ -190,7 +190,7 @@
               v-hasPermission="
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.audit`
                 `warehouseManagement.warehouse.warehouseInfoTask.audit`
               "
               "
-              v-if="scope.row.taskStatus == '待审核'"
+              v-if="scope.row.taskStatus == '待审核'&&scope.row.taskId!=null"
               class="adjustment"
               class="adjustment"
               @click="delivery(scope.row)"
               @click="delivery(scope.row)"
             >
             >

+ 40 - 1
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -294,7 +294,7 @@
               class="typeselect"
               class="typeselect"
             >
             >
               <el-option
               <el-option
-                v-for="item in contractNoList"
+                v-for="item in contractNoList1"
                 :key="item.constKey"
                 :key="item.constKey"
                 :label="item.contractNo"
                 :label="item.contractNo"
                 :value="item.contractNo"
                 :value="item.contractNo"
@@ -684,12 +684,31 @@ export default {
     isShow(val) {
     isShow(val) {
       this.showType = val
       this.showType = val
     },
     },
+    flag(val){
+      xialaNo({
+        compId: this.compId,
+        flag: val
+      })
+        .toPromise()
+        .then((response) => {
+          if(this.dataList1.taskTypeKey == 2 || this.dataList1.taskTypeKey == 4){
+              this.contractNoList1 = response
+              if(this.dataList1.taskTypeKey == 2){
+                this.contractNoList = response
+              }
+          }
+          else{
+              this.contractNoList = response
+          }
+        })
+    }
   },
   },
   computed: {
   computed: {
     ...mapGetters(['deptBudgetList']),
     ...mapGetters(['deptBudgetList']),
   },
   },
   data() {
   data() {
     return {
     return {
+      flag:1,
       //弹出框
       //弹出框
       dialogViewSpareMoney: false,
       dialogViewSpareMoney: false,
       dialogApproveFormVisible: false,
       dialogApproveFormVisible: false,
@@ -703,6 +722,7 @@ export default {
       // 年
       // 年
       year: '',
       year: '',
       contractNoList: [],
       contractNoList: [],
+      contractNoList1: [],
       deptBudgetTotal: 0,
       deptBudgetTotal: 0,
       readonly: true,
       readonly: true,
       currentPage: 1,
       currentPage: 1,
@@ -995,6 +1015,10 @@ export default {
       }
       }
     },
     },
     selectstorageType(e) {
     selectstorageType(e) {
+      switch(e){
+        case "采购出库": this.flag = 0;break
+        case "销售出库": this.flag = 1;break
+      }
       for (var i = 0; i < this.storageType.length; i++) {
       for (var i = 0; i < this.storageType.length; i++) {
         if (this.storageType[i].constValue == e) {
         if (this.storageType[i].constValue == e) {
           this.dataList.inOutTypeKey = this.storageType[i].constKey
           this.dataList.inOutTypeKey = this.storageType[i].constKey
@@ -1002,6 +1026,10 @@ export default {
       }
       }
     },
     },
     selectstorageType1(e) {
     selectstorageType1(e) {
+      switch(e){
+        case "采购入库": this.flag = 0;break
+        case "退库": this.flag = 2;break
+      }
       for (var i = 0; i < this.storageType1.length; i++) {
       for (var i = 0; i < this.storageType1.length; i++) {
         if (this.storageType1[i].constValue == e) {
         if (this.storageType1[i].constValue == e) {
           this.dataList1.inOutTypeKey = this.storageType1[i].constKey
           this.dataList1.inOutTypeKey = this.storageType1[i].constKey
@@ -1047,10 +1075,12 @@ export default {
       if(this.dataList.taskTypeKey==1){
       if(this.dataList.taskTypeKey==1){
         this.dataList.inOutType='销售出库'
         this.dataList.inOutType='销售出库'
         this.dataList.inOutTypeKey='1'
         this.dataList.inOutTypeKey='1'
+        this.flag = 1
       }
       }
       if(this.dataList1.taskTypeKey==2){
       if(this.dataList1.taskTypeKey==2){
         this.dataList1.inOutType='采购入库'
         this.dataList1.inOutType='采购入库'
         this.dataList1.inOutTypeKey='1'
         this.dataList1.inOutTypeKey='1'
+        this.flag = 0
       }
       }
       else if(this.dataList1.taskTypeKey==3){
       else if(this.dataList1.taskTypeKey==3){
         this.disabled=true
         this.disabled=true
@@ -1063,6 +1093,7 @@ export default {
         this.dataList1.inOutType='退库'
         this.dataList1.inOutType='退库'
         this.dataList1.inOutTypeKey='6'
         this.dataList1.inOutTypeKey='6'
         this.dataList.inOutType='销售出库'
         this.dataList.inOutType='销售出库'
+        this.flag = 2
         this.dataList.inOutTypeKey='1'
         this.dataList.inOutTypeKey='1'
       }
       }
     },
     },
@@ -1096,6 +1127,12 @@ export default {
         this.$set(this.dataList1,'grade','一等品')
         this.$set(this.dataList1,'grade','一等品')
         this.$set(this.dataList1,'gradeKey','1')
         this.$set(this.dataList1,'gradeKey','1')
       }
       }
+      switch(this.dataList.inOutType){
+        case "采购出库": this.flag = 0;break
+        case "采购入库": this.flag = 0;break
+        case "销售出库": this.flag = 1;break
+        case "退库": this.flag = 2;break
+      }
       
       
       // 货名
       // 货名
       pullDown({ constId: 'CON2' })
       pullDown({ constId: 'CON2' })
@@ -1121,10 +1158,12 @@ export default {
         })
         })
       xialaNo({
       xialaNo({
         compId: this.compId,
         compId: this.compId,
+        flag: this.flag
       })
       })
         .toPromise()
         .toPromise()
         .then((response) => {
         .then((response) => {
           this.contractNoList = response
           this.contractNoList = response
+          // this.contractNoList1 = response
         })
         })
       // //临时仓库入库类型
       // //临时仓库入库类型
       // pullDown({ constId: 'WARE1' })
       // pullDown({ constId: 'WARE1' })

+ 1 - 1
src/views/tranManagement/component/routers/route.js

@@ -9,7 +9,7 @@ const tranManagementRouter = {
   meta: {
   meta: {
     title: 'tranManagement',
     title: 'tranManagement',
     module: 'transportationTask.transportation',
     module: 'transportationTask.transportation',
-    icon: 'cg'
+    icon: '-yunshu2'
   },
   },
   children: [
   children: [
 
 

+ 1 - 1
src/views/warehouse/component/router/index.js

@@ -9,7 +9,7 @@ const warehouseManagementRouter = {
   meta: {
   meta: {
     title: 'warehouseManagementList',
     title: 'warehouseManagementList',
     module: 'warehouseManagement',
     module: 'warehouseManagement',
-    icon: 'cg'
+    icon: '-cangkubeifen'
   },
   },
   children: [
   children: [
     {
     {

+ 4 - 2
vue.config.js

@@ -58,7 +58,8 @@ const cdn = {
   css: {
   css: {
     dev: [
     dev: [
       "/cdn/element-ui/2.13.2/theme-chalk/index.css",
       "/cdn/element-ui/2.13.2/theme-chalk/index.css",
-      "//at.alicdn.com/t/font_1833052_qk0ltgbl23s.css"
+      `./static/iconfont/iconfont.css`,
+      `./static/logo/iconfont.css`
     ],
     ],
     ship: [
     ship: [
       "/cdn/element-ui/2.13.2/theme-chalk/index.css",
       "/cdn/element-ui/2.13.2/theme-chalk/index.css",
@@ -68,7 +69,8 @@ const cdn = {
     product: [
     product: [
       `/cdn/winseaview/index.css`,
       `/cdn/winseaview/index.css`,
       "/cdn/element-ui/2.13.2/theme-chalk/index.css",
       "/cdn/element-ui/2.13.2/theme-chalk/index.css",
-      "//at.alicdn.com/t/font_1833052_qk0ltgbl23s.css",
+      `./static/iconfont/iconfont.css`,
+      `./static/logo/iconfont.css`
     ]
     ]
   }
   }
 }
 }

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov