fix: 修改bug

89c6d758 · 无尘 · 4b60fe22 · 89c6d758 · 89c6d758 · 89c6d758
Commit 89c6d758 authored Mar 11, 2020 by 无尘
13 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.24.css><link href=./static/css/app.170629cf5c82c4c7b47e370c5f49e899.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.f5c6085f5b178e8ad28e.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.21c11eb5217da021859e.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.24.css><link href=./static/css/app.14fd23d666217da5c0326ec56b9ce967.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.d9d56fb5f8b35b93cf35.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.ec984ec6971b2512fa4d.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.170629cf5c82c4c7b47e370c5f49e899.css
+++ b/dist/static/css/app.170629cf5c82c4c7b47e370c5f49e899.css
--- a/dist/static/js/0.b5c2beb958a50f5beadb.js
+++ b/dist/static/js/0.b5c2beb958a50f5beadb.js
--- a/dist/static/js/5.500be7143e86e7aad094.js
+++ b/dist/static/js/5.500be7143e86e7aad094.js
--- a/dist/static/js/8.149f1ceba8ad2d3abf33.js
+++ b/dist/static/js/8.149f1ceba8ad2d3abf33.js
--- a/dist/static/js/6.b748d7ac73a6d6700725.js
+++ b/dist/static/js/6.b748d7ac73a6d6700725.js
-webpackJsonp([6],{"2X9c":function(t,s,i){t.exports=i.p+"static/img/error_500.ed0cba4.svg"},FskK:function(t,s,i){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var a=i("2X9c"),e=i.n(a),c={name:"page500",data:function(){return{img_500:e.a}},computed:{message:function(){return"抱歉，服务器出错了"}}},n={render:function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticStyle:{background:"#f0f2f5","margin-top":"-20px",height:"100%"}},[s("div",{staticClass:"wscn-http404"},[s("div",{staticClass:"pic-404"},[s("img",{staticClass:"pic-404__parent",attrs:{src:this.img_500,alt:"500"}})]),this._v(" "),s("div",{staticClass:"bullshit"},[s("div",{staticClass:"bullshit__headline"},[this._v(this._s(this.message))]),this._v(" "),s("a",{staticClass:"bullshit__return-home",attrs:{href:"#/companyGroup"}},[this._v("返回首页")])])])])},staticRenderFns:[]};var r=i("VU/8")(c,n,!1,function(t){i("wc9b")},"data-v-a27616c0",null);s.default=r.exports},wc9b:function(t,s){}});
+webpackJsonp([7],{"2X9c":function(t,s,i){t.exports=i.p+"static/img/error_500.ed0cba4.svg"},FskK:function(t,s,i){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var a=i("2X9c"),e=i.n(a),c={name:"page500",data:function(){return{img_500:e.a}},computed:{message:function(){return"抱歉，服务器出错了"}}},n={render:function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticStyle:{background:"#f0f2f5","margin-top":"-20px",height:"100%"}},[s("div",{staticClass:"wscn-http404"},[s("div",{staticClass:"pic-404"},[s("img",{staticClass:"pic-404__parent",attrs:{src:this.img_500,alt:"500"}})]),this._v(" "),s("div",{staticClass:"bullshit"},[s("div",{staticClass:"bullshit__headline"},[this._v(this._s(this.message))]),this._v(" "),s("a",{staticClass:"bullshit__return-home",attrs:{href:"#/companyGroup"}},[this._v("返回首页")])])])])},staticRenderFns:[]};var r=i("VU/8")(c,n,!1,function(t){i("wc9b")},"data-v-a27616c0",null);s.default=r.exports},wc9b:function(t,s){}});
\ No newline at end of file
--- a/dist/static/js/7.ee9b4ffcf8a8cc2fde16.js
+++ b/dist/static/js/7.ee9b4ffcf8a8cc2fde16.js
-webpackJsonp([7],{B9Yg:function(t,s,e){t.exports=e.p+"static/img/gic-error.8aba914.png"},E5h1:function(t,s){},"Q3j/":function(t,s,e){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var i=e("B9Yg"),a=e.n(i),n={name:"page404",data:function(){return{img_404:a.a}},computed:{message:function(){return"登录遇到错误啦！请确认您是否已是好办管理员，如不是，请联系管理员。"}},mounted:function(){}},r={render:function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticStyle:{background:"#f0f2f5","margin-top":"-20px",height:"100%"}},[s("div",{staticClass:"wscn-http404"},[s("div",{staticClass:"pic-404"},[s("img",{staticClass:"pic-404__parent",attrs:{src:this.img_404,alt:"404"}})]),this._v(" "),s("div",{staticClass:"bullshit"},[s("div",{staticClass:"bullshit__headline"},[this._v(this._s(this.message))]),this._v(" "),s("a",{staticClass:"bullshit__return-home",attrs:{href:"#/login",rel:"noopener noreferrer"}},[this._v("返回好办登录页")])])])])},staticRenderFns:[]};var c=e("VU/8")(n,r,!1,function(t){e("E5h1")},"data-v-88bc4a48",null);s.default=c.exports}});
+webpackJsonp([8],{B9Yg:function(t,s,e){t.exports=e.p+"static/img/gic-error.8aba914.png"},E5h1:function(t,s){},"Q3j/":function(t,s,e){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var i=e("B9Yg"),a=e.n(i),n={name:"page404",data:function(){return{img_404:a.a}},computed:{message:function(){return"登录遇到错误啦！请确认您是否已是好办管理员，如不是，请联系管理员。"}},mounted:function(){}},r={render:function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticStyle:{background:"#f0f2f5","margin-top":"-20px",height:"100%"}},[s("div",{staticClass:"wscn-http404"},[s("div",{staticClass:"pic-404"},[s("img",{staticClass:"pic-404__parent",attrs:{src:this.img_404,alt:"404"}})]),this._v(" "),s("div",{staticClass:"bullshit"},[s("div",{staticClass:"bullshit__headline"},[this._v(this._s(this.message))]),this._v(" "),s("a",{staticClass:"bullshit__return-home",attrs:{href:"#/login",rel:"noopener noreferrer"}},[this._v("返回好办登录页")])])])])},staticRenderFns:[]};var c=e("VU/8")(n,r,!1,function(t){e("E5h1")},"data-v-88bc4a48",null);s.default=c.exports}});
\ No newline at end of file
--- a/dist/static/js/app.21c11eb5217da021859e.js
+++ b/dist/static/js/app.21c11eb5217da021859e.js
--- a/dist/static/js/manifest.f5c6085f5b178e8ad28e.js
+++ b/dist/static/js/manifest.f5c6085f5b178e8ad28e.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=d(d.s=r[i]);return b};var a={},f={51:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"b5c2beb958a50f5beadb",1:"06c4e42e62c1f75191f0",2:"724ba299b800aa0b3c25",3:"e6962450c8d5738c3319",4:"f1674bae959e941960b1",5:"500be7143e86e7aad094",6:"b748d7ac73a6d6700725",7:"ee9b4ffcf8a8cc2fde16",8:"149f1ceba8ad2d3abf33",9:"916e0ede46ca141d75b8",10:"8144b2952e608c99c868",11:"e17569badebc0d03b94f",12:"106cadf87efaf0fd28ce",13:"0f01707cee8bf5918701",14:"a034fd161b8c1b267354",15:"e2410478e3a7240b7adc",16:"982b6d4cc452775c1826",17:"91e2fe42aacd5fd73d9e",18:"a4c6826038e63e26db84",19:"56fbc2476082c554cb76",20:"7f3a92bcf5a66089600a",21:"857b8bbdd27214a8bc25",22:"9ad786a93be8761b954d",23:"44f8721a4e37849af31a",24:"40fac2805362183128cd",25:"478df3da4cb7c7af6a47",26:"d2a69d136f7452d5784b",27:"217dc34d1a705f1d98da",28:"da436cef50554854b5f4",29:"7b201172482e527d64c7",30:"d271c65352b153fe44d7",31:"f10d5ff5623699d9f45c",32:"fdc8fb944fc839a5f0c9",33:"64721b581ad65fc06a5c",34:"1f69600f84ea88db4621",35:"51630c67df4e611a358a",36:"030f99cc1cb0eb54f38a",37:"722ec3ee74746d1f0771",38:"5c593f6c0886723307a9",39:"13770623cd0155327e56",40:"f6ef482085cccdca5f67",41:"d2e13a048e460fe7db63",42:"bbfc8147188dfd7ffd12",43:"5d2d83cd76295aac795e",44:"894c9353222f503048dd",45:"e943700ad9539430cc2a",46:"3ebb7632373e949c4784",47:"db2230e175441528fa76",48:"bda5c55f72a191ae99c2"}[e]+".js";var t=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=o,n.appendChild(r),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=d(d.s=r[i]);return b};var a={},f={51:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"1d78c2e96a4878f71b40",1:"06c4e42e62c1f75191f0",2:"724ba299b800aa0b3c25",3:"e6962450c8d5738c3319",4:"f1674bae959e941960b1",5:"0afe55d24fb19873fc64",6:"92d65b86c72b55b797ad",7:"c17157f1c4fc3d3b8c42",8:"046fad46a415c0979300",9:"916e0ede46ca141d75b8",10:"8144b2952e608c99c868",11:"e17569badebc0d03b94f",12:"106cadf87efaf0fd28ce",13:"0f01707cee8bf5918701",14:"a034fd161b8c1b267354",15:"e2410478e3a7240b7adc",16:"982b6d4cc452775c1826",17:"91e2fe42aacd5fd73d9e",18:"a4c6826038e63e26db84",19:"56fbc2476082c554cb76",20:"7f3a92bcf5a66089600a",21:"857b8bbdd27214a8bc25",22:"9ad786a93be8761b954d",23:"44f8721a4e37849af31a",24:"40fac2805362183128cd",25:"478df3da4cb7c7af6a47",26:"d2a69d136f7452d5784b",27:"217dc34d1a705f1d98da",28:"da436cef50554854b5f4",29:"7b201172482e527d64c7",30:"d271c65352b153fe44d7",31:"f10d5ff5623699d9f45c",32:"fdc8fb944fc839a5f0c9",33:"64721b581ad65fc06a5c",34:"1f69600f84ea88db4621",35:"51630c67df4e611a358a",36:"030f99cc1cb0eb54f38a",37:"722ec3ee74746d1f0771",38:"5c593f6c0886723307a9",39:"13770623cd0155327e56",40:"f6ef482085cccdca5f67",41:"d2e13a048e460fe7db63",42:"bbfc8147188dfd7ffd12",43:"5d2d83cd76295aac795e",44:"894c9353222f503048dd",45:"e943700ad9539430cc2a",46:"3ebb7632373e949c4784",47:"db2230e175441528fa76",48:"bda5c55f72a191ae99c2"}[e]+".js";var t=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=o,n.appendChild(r),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/company/wx-tree.vue
+++ b/src/components/company/wx-tree.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-08-14 16:51:07
 * @LastEditors: 无尘
- * @LastEditTime: 2020-03-10 18:47:43
+ * @LastEditTime: 2020-03-11 10:41:25
 -->
 <!--
 <wx-tree v-model="itemData" ></wx-tree>
@@ -185,6 +185,13 @@ export default {
      console.log('wx:change:', value, that.itemObj);
      // 跨级移动后还要判断原来父级有没有子级，设置
      if (value['removed']) {
+        console.log('removed:',that.itemData)
+        localforage
+          .getItem('org' + value['removed'].element.parentDepartmentId)
+          .then(val => {
+            //  当离线仓库中的值被载入时，此处代码运行
+            console.log('localforage:',val);
+          })
        if (that.itemData.length) {
          console.log('跨级移动remove:',)
          that.itemObj.hasSonNode = true;

--- a/src/components/vue-office-header.vue
+++ b/src/components/vue-office-header.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2018-10-10 17:21:32
 * @LastEditors: 无尘
- * @LastEditTime: 2020-03-09 13:59:38
+ * @LastEditTime: 2020-03-11 11:11:44
 -->
 <template>
  <div class="navheader">
@@ -123,7 +123,7 @@ export default {
        })
        .then(() => {
          that.axios
-            .post('/haoban-manage3-web/logout', {})
+            .post('/haoban-manage3-web/login-out', {})
            .then(res => {
              let resData = res.data;
              if (resData.errorCode == 1) {

--- a/src/views/business/orgStructSet.vue
+++ b/src/views/business/orgStructSet.vue
@@ -4,12 +4,12 @@
 * @Author: 无尘
 * @Date: 2019-03-20 14:36:37
 * @LastEditors: 无尘
- * @LastEditTime: 2020-03-11 09:35:59
+ * @LastEditTime: 2020-03-11 11:03:19
 -->
 <template>
  <div class="my-customer-wrap common-set-wrap">
    <nav-crumb :navpath="navpath"> </nav-crumb>
-    <div class="right-content">
+    <div class="right-content" v-loading="loading">
      <div class="right-box" :style="{ 'min-height': bgHeight }">
        <div class="apps-content flex" :style="{ 'min-height': bgHeight }">
          <div class="apps-content-left">
@@ -94,6 +94,7 @@ export default {
  data() {
    return {
      bgHeight: window.screen.availHeight - 380 + 'px',
+      loading: false,
      // 面包屑参数
      navpath: [
        {
@@ -157,10 +158,10 @@ export default {
     */
    saveData: _debounce(function() {
      const that = this; //!that.$store.state.addDepartment.length &&
-      if (!that.$store.state.addDepartment.length && !that.$store.state.editDepartment.length) {
+      /* if (!that.$store.state.addDepartment.length && !that.$store.state.editDepartment.length) {
        showMsg.showmsg('暂无修改，无法同步', 'warning');
        return false;
-      }
+      } */
      // 去除重复添加数据
      // 1.
      if (that.$store.state.addDepartment.length) {
@@ -197,6 +198,7 @@ export default {
    }, 300),
    postSaveData() {
      const that = this;
+      that.loading = true;
      let para = {
        addDepartment: JSON.stringify(that.$store.state.addDepartment),
        editDepartment: JSON.stringify(that.$store.state.editDepartment)
@@ -205,6 +207,7 @@ export default {
        .then(res => {
          let resData = res.data;
          if (resData.errorCode == 1) {
+            that.loading = false;
            showMsg.showmsg('同步成功', 'success');
            that.$store.dispatch('clearTreeData');
            // 同步后需要刷新数据
@@ -215,6 +218,7 @@ export default {
          errMsg.errorMsg(resData);
        })
        .catch(function(error) {
+          that.loading = false;
          that.$message.error({
            duration: 1000,
            message: error.message

--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2018-10-10 14:44:45
 * @LastEditors: 无尘
- * @LastEditTime: 2020-03-11 09:13:37
+ * @LastEditTime: 2020-03-11 10:32:54
 -->
 <template>
  <div class="login-wrap">
@@ -56,10 +56,10 @@ export default {
      // 企业列表
      enterpriseList: [
        /*{
-                                                                        enterpriseId  : '1231',
+          enterpriseId  : '1231',
-                                                                        logoUrl: require("../../assets/logo.png"),
+          logoUrl: require("../../assets/logo.png"),
-                                                                        enterpriseName: '达摩网络'
+          enterpriseName: '达摩网络'
-                                                                      },*/
+        },*/
      ],
      // 登录