Skip to content

H
haoban-3
Commit 7139ff3c by 无尘
Options

fix: 修改bug

parent 89c6d758
Showing with 36 additions and 18 deletions
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.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> <!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.50b68ae076dd72f073ebff1db559b0c0.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.16738467bdea1c97e329.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.bd1100753b9b50879093.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/10.8144b2952e608c99c868.js deleted 100644 → 0
webpackJsonp([10],{AejC:function(t,s,i){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var e=i("Minx"),a=i.n(e),n={name:"page404",data:function(){return{img_404:a.a}},computed:{message:function(){return"抱歉，你访问的页面不存在"}},mounted:function(){}},c={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:"#/companyGroup"}},[this._v("返回首页")])])])])},staticRenderFns:[]};var r=i("VU/8")(n,c,!1,function(t){i("tDw4")},"data-v-5bffce3c",null);s.default=r.exports},Minx:function(t,s,i){t.exports=i.p+"static/img/error_404.bf58747.svg"},tDw4:function(t,s){}});
\ No newline at end of file
dist/static/js/5.0afe55d24fb19873fc64.js → dist/static/js/5.5ade8ed391cc2de17ee4.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.c17157f1c4fc3d3b8c42.js → dist/static/js/6.b748d7ac73a6d6700725.js
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){}}); 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){}});
\ No newline at end of file \ No newline at end of file
dist/static/js/8.046fad46a415c0979300.js → dist/static/js/7.ee9b4ffcf8a8cc2fde16.js
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}}); 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}});
\ No newline at end of file \ No newline at end of file
dist/static/js/9.5e6b743726e7d8438871.js 0 → 100644
webpackJsonp([9],{AejC:function(t,s,i){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var e=i("Minx"),a=i.n(e),n={name:"page404",data:function(){return{img_404:a.a}},computed:{message:function(){return"抱歉，你访问的页面不存在"}},mounted:function(){}},c={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:"#/companyGroup"}},[this._v("返回首页")])])])])},staticRenderFns:[]};var r=i("VU/8")(n,c,!1,function(t){i("tDw4")},"data-v-5bffce3c",null);s.default=r.exports},Minx:function(t,s,i){t.exports=i.p+"static/img/error_404.bf58747.svg"},tDw4:function(t,s){}});
\ No newline at end of file
dist/static/js/manifest.d9d56fb5f8b35b93cf35.js → dist/static/js/manifest.16738467bdea1c97e329.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:"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}}([]); !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:"5ade8ed391cc2de17ee4",6:"b748d7ac73a6d6700725",7:"ee9b4ffcf8a8cc2fde16",8:"bda5789112a4386ac684",9:"5e6b743726e7d8438871",10:"cdc6733af07fe3483e78",11:"529019747940d70381f8",12:"8c2e25b234e6c994122b",13:"99d2b55639e7b5b72ff7",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 \ No newline at end of file
src/components/company/wx-tree.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-08-14 16:51:07 * @Date: 2019-08-14 16:51:07
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-03-11 10:41:25 * @LastEditTime: 2020-03-11 12:25:26
--> -->
<!-- <!--
<wx-tree v-model="itemData" ></wx-tree> <wx-tree v-model="itemData" ></wx-tree>
...@@ -186,12 +186,6 @@ export default { ...@@ -186,12 +186,6 @@ export default {
// 跨级移动后还要判断原来父级有没有子级，设置 // 跨级移动后还要判断原来父级有没有子级，设置
if (value['removed']) { if (value['removed']) {
console.log('removed:',that.itemData) console.log('removed:',that.itemData)
localforage
.getItem('org' + value['removed'].element.parentDepartmentId)
.then(val => {
// 当离线仓库中的值被载入时，此处代码运行
console.log('localforage:',val);
})
if (that.itemData.length) { if (that.itemData.length) {
console.log('跨级移动remove:',) console.log('跨级移动remove:',)
that.itemObj.hasSonNode = true; that.itemObj.hasSonNode = true;
...@@ -207,6 +201,7 @@ export default { ...@@ -207,6 +201,7 @@ export default {
that.itemObj.children[index].sort = index; that.itemObj.children[index].sort = index;
if (value[objKey].element.departmentId == that.itemObj.children[index].departmentId) { if (value[objKey].element.departmentId == that.itemObj.children[index].departmentId) {
sort = index; sort = index;
that.itemObj.children[index].parentDepartmentIdOld = that.itemObj.children[index].parentDepartmentId;
that.itemObj.children[index].parentId = that.itemObj.departmentId; that.itemObj.children[index].parentId = that.itemObj.departmentId;
that.itemObj.children[index].parentDepartmentId = that.itemObj.departmentId; that.itemObj.children[index].parentDepartmentId = that.itemObj.departmentId;
that.itemObj.children[index].level = that.itemObj.level + 1; that.itemObj.children[index].level = that.itemObj.level + 1;
...@@ -220,6 +215,7 @@ export default { ...@@ -220,6 +215,7 @@ export default {
console.log('父级:', that.itemObj); console.log('父级:', that.itemObj);
let newEle = JSON.parse(JSON.stringify(value[objKey].element)); let newEle = JSON.parse(JSON.stringify(value[objKey].element));
newEle.parentDepartmentIdOld = newEle.parentDepartmentId;
newEle.parentId = that.itemObj.departmentId; newEle.parentId = that.itemObj.departmentId;
newEle.parentDepartmentId = that.itemObj.departmentId; newEle.parentDepartmentId = that.itemObj.departmentId;
newEle.storeFlag = newEle.isStore; newEle.storeFlag = newEle.isStore;
...@@ -615,6 +611,20 @@ export default { ...@@ -615,6 +611,20 @@ export default {
}); });
}); });
}, },
/**
* 处理变化的数据
*/
handleChangeChild(parent,item) {
const that = this;
for (let index = 0; index < item.length; index++) {
item[index].parentDepartmentId = parent.departmentId;
item[index].level = parent.level + 1;
if (item[index].children.length) {
that.itemData[index].hasSonNode = true;
that.handleChangeChild(that.itemData[index],that.itemData[index].children);
}
}
},
/** /**
* 获取存储的数据 * 获取存储的数据
...@@ -630,6 +640,14 @@ export default { ...@@ -630,6 +640,14 @@ export default {
if (!that.itemData[index].loaded) { if (!that.itemData[index].loaded) {
that.itemData[index].children = await that.getChildData(that.itemData[index]); that.itemData[index].children = await that.getChildData(that.itemData[index]);
} }
// 拖拽进去
if (that.itemData[index].loaded && !that.itemData[index].children.length) {
that.itemData[index].hasSonNode = false;
}
if (that.itemData[index].children.length) {
that.itemData[index].hasSonNode = true;
that.handleChangeChild(that.itemData[index],that.itemData[index].children);
}
} }
} }
} }
......
src/views/login/index.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2018-10-10 14:44:45 * @Date: 2018-10-10 14:44:45
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-03-11 10:32:54 * @LastEditTime: 2020-03-11 12:14:24
--> -->
<template> <template>
<div class="login-wrap"> <div class="login-wrap">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment