update queue

2dff02b8 · gongzijian · 2f8acc5b · 2dff02b8 · 2dff02b8 · 2dff02b8
3 changed file
--- a/docs/zh_CN/_book/前端部署文档.html
+++ b/docs/zh_CN/_book/前端部署文档.html
@@ -430,22 +430,12 @@
                                <section class="normal markdown-section">
                                
                                <h1 id="&#x524D;&#x7AEF;&#x90E8;&#x7F72;&#x6587;&#x6863;">&#x524D;&#x7AEF;&#x90E8;&#x7F72;&#x6587;&#x6863;</h1>
-<ul>
-<li><h5 id="1-&#x5F00;&#x53D1;&#x73AF;&#x5883;&#x642D;&#x5EFA;">1. &#x5F00;&#x53D1;&#x73AF;&#x5883;&#x642D;&#x5EFA;</h5>
-</li>
-<li><h5 id="2-&#x81EA;&#x52A8;&#x5316;&#x90E8;&#x7F72;">2. &#x81EA;&#x52A8;&#x5316;&#x90E8;&#x7F72;</h5>
-</li>
-<li><h5 id="3-&#x624B;&#x52A8;&#x90E8;&#x7F72;">3. &#x624B;&#x52A8;&#x90E8;&#x7F72;</h5>
-</li>
-<li><h5 id="4-liunx&#x4E0B;&#x4F7F;&#x7528;node&#x542F;&#x52A8;&#x5E76;&#x4E14;&#x5B88;&#x62A4;&#x8FDB;&#x7A0B;">4. Liunx&#x4E0B;&#x4F7F;&#x7528;node&#x542F;&#x52A8;&#x5E76;&#x4E14;&#x5B88;&#x62A4;&#x8FDB;&#x7A0B;</h5>
-</li>
-</ul>
 <h3 id="1&#x5F00;&#x53D1;&#x73AF;&#x5883;&#x642D;&#x5EFA;">1.&#x5F00;&#x53D1;&#x73AF;&#x5883;&#x642D;&#x5EFA;</h3>
 <ul>
-<li><h4 id="node&#x5B89;&#x88C5;">node&#x5B89;&#x88C5;</h4>
+<li><h4 id="&#x5B89;&#x88C5;node">&#x5B89;&#x88C5;node</h4>
 <p>Node&#x5305;&#x4E0B;&#x8F7D; (&#x6CE8;&#x610F;&#x7248;&#x672C; 8.9.4) <code>https://nodejs.org/download/release/v8.9.4/</code> </p>
 </li>
-<li><h4 id="&#x524D;&#x7AEF;&#x9879;&#x76EE;&#x6784;&#x5EFA;">&#x524D;&#x7AEF;&#x9879;&#x76EE;&#x6784;&#x5EFA;</h4>
+<li><h4 id="&#x6784;&#x5EFA;&#x9879;&#x76EE;">&#x6784;&#x5EFA;&#x9879;&#x76EE;</h4>
 <p>&#x7528;&#x547D;&#x4EE4;&#x884C;&#x6A21;&#x5F0F; <code>cd</code>  &#x8FDB;&#x5165; <code>escheduler-ui</code>&#x9879;&#x76EE;&#x76EE;&#x5F55;&#x5E76;&#x6267;&#x884C; <code>npm install</code> &#x62C9;&#x53D6;&#x9879;&#x76EE;&#x4F9D;&#x8D56;&#x5305;</p>
 </li>
 </ul>
@@ -469,6 +459,7 @@ API_BASE = http://192.168.220.204:12345
 <li><p><code>npm run build</code> &#x9879;&#x76EE;&#x6253;&#x5305; (&#x6253;&#x5305;&#x540E;&#x6839;&#x76EE;&#x5F55;&#x4F1A;&#x521B;&#x5EFA;&#x4E00;&#x4E2A;&#x540D;&#x4E3A;dist&#x6587;&#x4EF6;&#x5939;&#xFF0C;&#x7528;&#x4E8E;&#x53D1;&#x5E03;&#x7EBF;&#x4E0A;Nginx)</p>
 </li>
 </ul>
+<h3 id="2&#x81EA;&#x52A8;&#x90E8;&#x7F72;&#x65B9;&#x5F0F;">2.&#x81EA;&#x52A8;&#x90E8;&#x7F72;&#x65B9;&#x5F0F;</h3>
 <h3 id="2&#x81EA;&#x52A8;&#x5316;&#x90E8;&#x7F72;">2.&#x81EA;&#x52A8;&#x5316;&#x90E8;&#x7F72;`</h3>
 <p>&#x5728;&#x9879;&#x76EE;<code>escheduler-ui</code>&#x6839;&#x76EE;&#x5F55;&#x7F16;&#x8F91;&#x5B89;&#x88C5;&#x6587;&#x4EF6;<code>vi install(&#x7EBF;&#x4E0A;&#x73AF;&#x5883;).sh</code></p>
 <p>&#x66F4;&#x6539;&#x524D;&#x7AEF;&#x8BBF;&#x95EE;&#x7AEF;&#x53E3;&#x548C;&#x540E;&#x7AEF;&#x4EE3;&#x7406;&#x63A5;&#x53E3;&#x5730;&#x5740;</p>
@@ -478,6 +469,8 @@ esc_proxy=&quot;8888&quot;
 # &#x914D;&#x7F6E;&#x4EE3;&#x7406;&#x540E;&#x7AEF;&#x63A5;&#x53E3;
 esc_proxy_port=&quot;http://192.168.220.154:12345&quot;
 </code></pre><p>&#x524D;&#x7AEF;&#x81EA;&#x52A8;&#x90E8;&#x7F72;&#x57FA;&#x4E8E;<code>yum</code>&#x64CD;&#x4F5C;&#xFF0C;&#x90E8;&#x7F72;&#x4E4B;&#x524D;&#x8BF7;&#x5148;&#x5B89;&#x88C5;&#x66F4;&#x65B0;`yum</p>
+<p>&#x5728;&#x9879;&#x76EE;<code>escheduler-ui</code>&#x6839;&#x76EE;&#x5F55;&#x4E0B;&#xFF0C;&#x4FEE;&#x6539;install.sh&#x4E2D;&#x7684;&#x53C2;&#x6570;&#xFF0C;&#x6267;&#x884C;<code>./install(&#x7EBF;&#x4E0A;&#x73AF;&#x5883;).sh</code> </p>
+<h3 id="3&#x624B;&#x52A8;&#x90E8;&#x7F72;&#x65B9;&#x5F0F;">3.&#x624B;&#x52A8;&#x90E8;&#x7F72;&#x65B9;&#x5F0F;</h3>
 <p>&#x5728;&#x9879;&#x76EE;<code>escheduler-ui</code>&#x6839;&#x76EE;&#x5F55;&#x6267;&#x884C;<code>./install(&#x7EBF;&#x4E0A;&#x73AF;&#x5883;).sh</code> </p>
 <h3 id="3&#x624B;&#x52A8;&#x90E8;&#x7F72;">3.&#x624B;&#x52A8;&#x90E8;&#x7F72;</h3>
 <p>&#x5B89;&#x88C5;epel&#x6E90; <code>yum install epel-release -y</code></p>
@@ -560,12 +553,14 @@ esc_proxy_port=&quot;http://192.168.220.154:12345&quot;
 &#x2502; npm      &#x2502; 0  &#x2502; N/A     &#x2502; fork &#x2502; 6168 &#x2502; online &#x2502; 31      &#x2502; 0s     &#x2502; 0%  &#x2502; 5.6 MB   &#x2502; root &#x2502; disabled &#x2502;
 &#x2514;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2534;&#x2500;&#x2500;&#x2500;&#x2500;&#x2534;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2534;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2534;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2534;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2534;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2534;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2534;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2534;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2534;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2534;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2518;
 Use `pm2 show &lt;id|name&gt;` to get more details about an app
-</code></pre><h2 id="&#x95EE;&#x9898;">&#x95EE;&#x9898;</h2>
-<h4 id="1-&#x4E0A;&#x4F20;&#x6587;&#x4EF6;&#x5927;&#x5C0F;&#x9650;&#x5236;">1. &#x4E0A;&#x4F20;&#x6587;&#x4EF6;&#x5927;&#x5C0F;&#x9650;&#x5236;</h4>
-<p>&#x7F16;&#x8F91;&#x914D;&#x7F6E;&#x6587;&#x4EF6; <code>vi /etc/nginx/nginx.conf</code></p>
-<pre><code># &#x66F4;&#x6539;&#x4E0A;&#x4F20;&#x5927;&#x5C0F;
-client_max_body_size 1024m
-</code></pre>
+## FAQ
+
+####  1. &#x4E0A;&#x4F20;&#x6587;&#x4EF6;&#x5927;&#x5C0F;&#x9650;&#x5236;
+&#x7F16;&#x8F91;&#x914D;&#x7F6E;&#x6587;&#x4EF6; `vi /etc/nginx/nginx.conf`
+</code></pre><h1 id="&#x66F4;&#x6539;&#x4E0A;&#x4F20;&#x5927;&#x5C0F;">&#x66F4;&#x6539;&#x4E0A;&#x4F20;&#x5927;&#x5C0F;</h1>
+<p>client_max_body_size 1024m
+```</p>
+
                                
                                </section>
                            
@@ -604,7 +599,7 @@ client_max_body_size 1024m
    <script>
        var gitbook = gitbook || [];
        gitbook.push(function() {
-            gitbook.page.hasChanged({"page":{"title":"环境搭建","level":"1.2.1","depth":2,"next":{"title":"安装及配置","level":"1.2.2","depth":2,"anchor":"#安装及配置","path":"前端部署文档.md","ref":"前端部署文档.md#安装及配置","articles":[]},"previous":{"title":"前端部署文档","level":"1.2","depth":1,"ref":"","articles":[{"title":"环境搭建","level":"1.2.1","depth":2,"anchor":"#前端项目环境构建及编译","path":"前端部署文档.md","ref":"前端部署文档.md#前端项目环境构建及编译","articles":[]},{"title":"安装及配置","level":"1.2.2","depth":2,"anchor":"#安装及配置","path":"前端部署文档.md","ref":"前端部署文档.md#安装及配置","articles":[]},{"title":"项目生产环境Nginx配置","level":"1.2.3","depth":2,"anchor":"#项目生产环境配置","path":"前端部署文档.md","ref":"前端部署文档.md#项目生产环境配置","articles":[]},{"title":"前端项目发布","level":"1.2.4","depth":2,"anchor":"#前端项目发布","path":"前端部署文档.md","ref":"前端部署文档.md#前端项目发布","articles":[]},{"title":"问题","level":"1.2.5","depth":2,"anchor":"#问题","path":"前端部署文档.md","ref":"前端部署文档.md#问题","articles":[]}]},"dir":"ltr"},"config":{"plugins":["expandable-chapters","insert-logo-link","livereload"],"styles":{"website":"./styles/website.css"},"pluginsConfig":{"livereload":{},"insert-logo-link":{"src":"http://geek.analysys.cn/static/upload/236/2019-03-29/379450b4-7919-4707-877c-4d33300377d4.png","url":"https://github.com/analysys/EasyScheduler"},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"fontsettings":{"theme":"white","family":"sans","size":2},"highlight":{},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false},"expandable-chapters":{}},"theme":"default","author":"YIGUAN","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{},"title":"调度系统-EasyScheduler","language":"zh-hans","gitbook":"3.2.3","description":"调度系统"},"file":{"path":"前端部署文档.md","mtime":"2019-04-12T01:30:07.632Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2019-04-10T07:14:01.407Z"},"basePath":".","book":{"language":""}});
+            gitbook.page.hasChanged({"page":{"title":"环境搭建","level":"1.2.1","depth":2,"next":{"title":"安装及配置","level":"1.2.2","depth":2,"anchor":"#安装及配置","path":"前端部署文档.md","ref":"前端部署文档.md#安装及配置","articles":[]},"previous":{"title":"前端部署文档","level":"1.2","depth":1,"ref":"","articles":[{"title":"环境搭建","level":"1.2.1","depth":2,"anchor":"#前端项目环境构建及编译","path":"前端部署文档.md","ref":"前端部署文档.md#前端项目环境构建及编译","articles":[]},{"title":"安装及配置","level":"1.2.2","depth":2,"anchor":"#安装及配置","path":"前端部署文档.md","ref":"前端部署文档.md#安装及配置","articles":[]},{"title":"项目生产环境Nginx配置","level":"1.2.3","depth":2,"anchor":"#项目生产环境配置","path":"前端部署文档.md","ref":"前端部署文档.md#项目生产环境配置","articles":[]},{"title":"前端项目发布","level":"1.2.4","depth":2,"anchor":"#前端项目发布","path":"前端部署文档.md","ref":"前端部署文档.md#前端项目发布","articles":[]},{"title":"问题","level":"1.2.5","depth":2,"anchor":"#问题","path":"前端部署文档.md","ref":"前端部署文档.md#问题","articles":[]}]},"dir":"ltr"},"config":{"plugins":["expandable-chapters","insert-logo-link","livereload"],"styles":{"website":"./styles/website.css"},"pluginsConfig":{"livereload":{},"insert-logo-link":{"src":"http://geek.analysys.cn/static/upload/236/2019-03-29/379450b4-7919-4707-877c-4d33300377d4.png","url":"https://github.com/analysys/EasyScheduler"},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"fontsettings":{"theme":"white","family":"sans","size":2},"highlight":{},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false},"expandable-chapters":{}},"theme":"default","author":"YIGUAN","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{},"title":"调度系统-EasyScheduler","language":"zh-hans","gitbook":"3.2.3","description":"调度系统"},"file":{"path":"前端部署文档.md","mtime":"2019-04-12T03:01:32.517Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2019-04-10T07:14:01.407Z"},"basePath":".","book":{"language":""}});
        });
    </script>
 </div>

--- a/docs/zh_CN/_book/后端部署文档.html
+++ b/docs/zh_CN/_book/后端部署文档.html
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue
@@ -65,26 +65,40 @@
        // edit
        if (this.item) {
          param.id = this.item.id
-          if (this.item.queueName === this.queueName && this.item.queue === this.queue) {
-            this.$message.warning(`名称和队列值未做更改`)
-            return
-          }
        }
-        this._verifyName(param).then(() => {
+
+        let $then = (res) => {
+          this.$emit('onUpdate')
+          this.$message.success(res.msg)
+          setTimeout(() => {
+            this.$refs['popup'].spinnerLoading = false
+          }, 800)
+        }
+
+        let $catch = (e) => {
+          this.$message.error(e.msg || '')
+          this.$refs['popup'].spinnerLoading = false
+        }
+
+        if (this.item) {
          this.$refs['popup'].spinnerLoading = true
-          this.store.dispatch(`security/${this.item ? 'updateQueueQ' : 'createQueueQ'}`, param).then(res => {
-            this.$emit('onUpdate')
-            this.$message.success(res.msg)
-            setTimeout(() => {
-              this.$refs['popup'].spinnerLoading = false
-            }, 800)
+          this.store.dispatch(`security/updateQueueQ`, param).then(res => {
+            $then(res)
+          }).catch(e => {
+            $catch(e)
+          })
+        }else{
+          this._verifyName(param).then(() => {
+            this.$refs['popup'].spinnerLoading = true
+            this.store.dispatch(`security/createQueueQ`, param).then(res => {
+              $then(res)
+            }).catch(e => {
+              $catch(e)
+            })
          }).catch(e => {
            this.$message.error(e.msg || '')
-            this.$refs['popup'].spinnerLoading = false
          })
-        }).catch(e => {
-          this.$message.error(e.msg || '')
-        })
+        }

      },
      _verification(){