From b2a04a496a092ae202d900633a30dba53e39f9d5 Mon Sep 17 00:00:00 2001 From: song Date: Tue, 22 Feb 2022 18:23:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AE=E6=92=AD=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/favicon.ico | Bin 67646 -> 26694 bytes public/index.html | 2 +- rest/http-client.env.json | 15 + rest/大唐.http | 79 +++++ src/api/carousel.js | 178 +++++++++++ src/api/login.js | 9 +- src/assets/quxia.png | Bin 8901 -> 26694 bytes .../Banner/detailsOfDistribution.vue | 118 +++++++ src/components/Banner/form.vue | 60 ++++ src/components/Banner/index.vue | 280 +++++++++++++++++ .../Detail/detailsOfDistribution.vue | 118 +++++++ src/components/Detail/form.vue | 60 ++++ src/components/Detail/index.vue | 268 ++++++++++++++++ src/filters/code.js | 292 ++++++++++++++++++ src/permission.js | 6 +- src/router/index.js | 3 +- src/router/menus/approval.js | 4 +- src/router/menus/building.js | 4 +- src/router/menus/department.js | 4 +- src/router/menus/others.js | 25 ++ src/store/modules/user.js | 8 +- src/styles/index.scss | 24 ++ src/styles/sidebar.scss | 15 +- src/styles/variables.scss | 22 +- src/utils/request.js | 2 +- .../advertisingPlan/index.vue | 2 +- .../classification.vue | 2 +- .../classificationList.vue | 2 +- .../classificationList.vue | 2 +- .../commodityManagement/productList/index.vue | 2 +- src/views/device/group/addDeviceModal.vue | 4 +- src/views/device/group/index.vue | 6 +- src/views/device/list/index.vue | 2 +- src/views/distribution/equipment/index.vue | 2 +- src/views/distribution/field/index.vue | 2 +- src/views/index/index.vue | 267 ++-------------- src/views/inventory/detail/table1.vue | 2 - src/views/inventory/list/index.vue | 4 +- src/views/lists/index.vue | 2 +- src/views/location/AddDevice2location.vue | 4 +- src/views/login/index.vue | 9 +- .../couponManagement/index.vue | 2 +- src/views/marketingCenter/luckyDraw/index.vue | 2 +- .../luckyDraw/luckyDrawDetails.vue | 2 +- src/views/marketingCenter/luckyFree/index.vue | 2 +- .../marketingCenter/noviceCourtesy/index.vue | 2 +- .../paymentOfCourtesy/index.vue | 2 +- .../marketingCenter/salesPromotion/index.vue | 2 +- src/views/order/luckyFree/index.vue | 2 +- src/views/order/salesOrder/index.vue | 2 +- src/views/orgManage/orgManage/index.vue | 2 +- .../privilegeManagement/account/index.vue | 2 +- src/views/privilegeManagement/role/index.vue | 4 +- .../privilegeManagement/role/permissions.vue | 2 +- src/views/richText/index.vue | 2 +- .../shelfs/list/putawayShelf/centerBtns.vue | 5 +- src/views/shelfs/list/table.vue | 7 +- src/views/shelfs/replenishment/quxia.vue | 2 +- src/views/shelfs/status/table.vue | 3 +- .../valueAddedAtatistics/index.vue | 4 +- vue.config.js | 40 +-- 61 files changed, 1651 insertions(+), 350 deletions(-) create mode 100644 rest/http-client.env.json create mode 100644 rest/大唐.http create mode 100644 src/api/carousel.js create mode 100644 src/components/Banner/detailsOfDistribution.vue create mode 100644 src/components/Banner/form.vue create mode 100644 src/components/Banner/index.vue create mode 100644 src/components/Detail/detailsOfDistribution.vue create mode 100644 src/components/Detail/form.vue create mode 100644 src/components/Detail/index.vue create mode 100644 src/filters/code.js create mode 100644 src/router/menus/others.js diff --git a/public/favicon.ico b/public/favicon.ico index 4fad8fe8801abf9da3a2d3e3d324838e3dc14ae3..649bc8d5656e01e0d06420f9b3190cdf11ac3b05 100644 GIT binary patch literal 26694 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 - 趣匣后台管理系统 + 大唐后台管理系统 diff --git a/rest/http-client.env.json b/rest/http-client.env.json new file mode 100644 index 0000000..34ce0f9 --- /dev/null +++ b/rest/http-client.env.json @@ -0,0 +1,15 @@ +{ + "$shared": { + "version": "v1", + "identifier": "wally", + "credential": "111111" + }, + "dev": { + "name": "dev", + "url": "http://192.168.0.99/gateway" + }, + "local": { + "version": "v2", + "url": "http://192.168.0.99/gateway" + } +} diff --git a/rest/大唐.http b/rest/大唐.http new file mode 100644 index 0000000..09cda08 --- /dev/null +++ b/rest/大唐.http @@ -0,0 +1,79 @@ +@dev = http://127.0.0.1:7270/v1.0/ +@test = https://test.tall.wiki/datang/v1.0/ +@www = http://www.tall.wiki/gateway/yanyuan/v2.0/ +@type = content-type: application/json;charset=utf-8 + +###网站轮播图查询 +POST {{test}}/carousel/query +{{type}} + +{ + "param":{ + "showPage":"0000" + } +} + +###列表查询 +GET {{test}}/content/list?showPage=0201&showPage=0210&year=&showType=1&pageNum=1&pageSize=5 + +###详情查询 +GET {{test}}/content/detail?introId=&showPage=0101 + +### 查询条件 +GET {{test}}/content/condition?showPage=0101 +### 查询常量 +GET {{test}}/constant/get?code=otherLink + + +-- 后台接口 + +### 登录 928bfd2577490322a6e19b793691467e +# @name login +POST {{test}}/back/home/login HTTP/1.1 +{{type}} + +{ + "userName":"admin", + "password": "123456" +} + +### 查询菜单 +POST {{test}}back/home/menus HTTP/1.1 +{{type}} +Authorization: {{login.response.body.$.data.token}} + +{ + +} + + +### 添加用户 +POST {{test}}/admin/add HTTP/1.1 +Authorization: {{login.response.body.$.data.token}} +{{type}} + +{ + "avatarUrl":"https://img2.baidu.com/it/u=1111829880,955526888&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500", + "userName":"admin", + "password": "123456", + "realName":"张三", + "phone":"15500000000" +} +### 添加用户 +POST {{test}}/back/contentIntro/list HTTP/1.1 +{{type}} + +{ + +} + +### 查询轮播图列表 +POST {{test}}/back/carousel/queryCarousel HTTP/1.1 +Authorization: {{login.response.body.$.data.token}} +{{type}} + +{ + "pageNum": 1, + "pageSize":10, + "showPage":"" +} diff --git a/src/api/carousel.js b/src/api/carousel.js new file mode 100644 index 0000000..60d4e8a --- /dev/null +++ b/src/api/carousel.js @@ -0,0 +1,178 @@ +import request from '@/utils/request' +const carousel = '/back/carousel' + +/** + * 查询轮播图列表 + * @param params + * @returns {Promise} + * @constructor + */ +export function POST_QUERY_CAROUSEL(params) { + return request({ + url: `${carousel}/queryCarousel`, + method: 'post', + data:params + }).then(res => res.data.data) +} + +/** + * 删除轮播图 + * @param params + * @returns {Promise} + * @constructor + */ +export function POST_DELETE_CAROUSEL(params) { + return request({ + url: `${carousel}/deleteCarousel`, + method: 'post', + data:params + }).then(res => res.data.data) +} + +/** + * 设备分润 -- 分润详情 + * @param params + * @returns {Promise} + * @constructor + */ +export function DETAIL_EQUIPMENT_LIST(params) { + return request({ + url: "/api/admin/deviceRoyalties/detail", + method: 'get', + params + }).then(res => res.data.data) +} + +/** + * 设备分润 -- 分润总数 + * @param params + * @returns {Promise} + * @constructor + */ +export function COUNT_EQUIPMENT_LIST(params) { + return request({ + url: "/api/admin/deviceRoyalties/count", + method: 'get', + params + }).then(res => res.data.data) +} + + +/** + * 设备分润 -- 生效 + * @param params + * @returns {Promise} + * @constructor + */ +export function ENABLE_EQUIPMENT_LIST(params) { + return request({ + url: "/api/admin/deviceRoyalties/enable", + method: 'post', + params + }).then(res => res.data.data) +} + + +/** + * 设备分润 -- 失效 + * @param params + * @returns {Promise} + * @constructor + */ +export function DISABLE_EQUIPMENT_LIST(params) { + return request({ + url: "/api/admin/deviceRoyalties/disable", + method: 'post', + params + }).then(res => res.data.data) +} + + + + + +/** + * 场地分润 -- 列表 + * @param params + * @returns {Promise} + * @constructor + */ +export function GET_FIELD_LIST(params) { + return request({ + url: "/api/admin/locationRoyalties", + method: 'get', + params + }).then(res => res.data.data) +} + +/** + * 场地分润 -- 保存分润 + * @param params + * @returns {Promise} + * @constructor + */ +export function POST_FIELD_LIST(params) { + return request({ + url: "/api/admin/locationRoyalties", + method: 'post', + data:params + }).then(res => res.data.data) +} + +/** + * 场地分润 -- 分润总数 + * @param params + * @returns {Promise} + * @constructor + */ +export function COUNT_FIELD_LIST(params) { + return request({ + url: "/api/admin/locationRoyalties/count", + method: 'get', + params + }).then(res => res.data.data) +} + +/** + * 场地分润 -- 分润详情 + * @param params + * @returns {Promise} + * @constructor + */ +export function DETAIL_FIELD_LIST(params) { + return request({ + url: "/api/admin/locationRoyalties/detail", + method: 'get', + params + }).then(res => res.data.data) +} + + +/** + * 场地分润 -- 生效 + * @param params + * @returns {Promise} + * @constructor + */ +export function ENABLE_FIELD_LIST(params) { + return request({ + url: "/api/admin/locationRoyalties/enable", + method: 'get', + params + }).then(res => res.data.data) +} + + +/** + * 场地分润 -- 失效 + * @param params + * @returns {Promise} + * @constructor + */ +export function DISABLE_FIELD_LIST(params) { + return request({ + url: "/api/admin/locationRoyalties/disable", + method: 'get', + params + }).then(res => res.data.data) +} diff --git a/src/api/login.js b/src/api/login.js index 2523862..49a229d 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -3,20 +3,19 @@ import { BASE_API } from '../config'; import qs from 'qs'; import { client_id, client_secret } from '@/config.js' export function loginByUsername(username, password) { - //https://www.zhangxinxu.com/wordpress/2018/08/js-base64-atob-btoa-encode-decode/ let Authorization = window.btoa(`${client_id}:${client_secret}`); const data = { - username, + userName: username, password, // "grant_type": 'merchant_password' } return axios({ url: BASE_API + '/back/home/login', method: 'POST', - data: qs.stringify(data), + data: qs.parse(data), headers: { - 'Authorization': `Basic ${Authorization}`, - 'content-type': 'application/x-www-form-urlencoded' + 'Authorization': `${Authorization}`, + 'content-type': 'application/json;charset=UTF-8' }, }) } diff --git a/src/assets/quxia.png b/src/assets/quxia.png index 3caf1cccea5f9474482ad354ad8a1478f5d63951..649bc8d5656e01e0d06420f9b3190cdf11ac3b05 100644 GIT binary patch literal 26694 zcmeHw3wT_`mFAJ`mMlw_CEK#pmSoG8CADP9*29*qm*t0Sz(RfqY>*)$7&eeEFl$Ic zcm!g?K(Y#KCRv6h*<}UWVNhr^;@l5`=6?= z+qYkG%QCb1=1a-dRk!NYsZ;0Ht;eZT$3z)4j~W|EhEL@aJwQYi6_Mw8L~9okm6WLG zf65|yrtn_4{7-s+|9jtS~&L)hu3j7uPp zx_Ijd^===f-X14iy2DAkFLu&pyH3!Rdrs26T_f;L>c7-Um+u~>tNKsS6?>gD(C?(H zE+3_yEgrgL`#9~|;i5|~Lb%gQeHV|@?p+?**%PF_yT)l>pN9_gd+6W+H(h;&i>}=7 zqrm|eU3I08t{(8xz!gEd?y8e?)dqH$HwW#>pk>WH;&USH@WDx!!G*ttvKA=%&AU&_@q{#YbOz*hT;Sk#TzTVIMvA zH8(x_NRWmfo20*cEKHAo{fz92-x?mHZ$9RsZwyb;_ntgKPkrMwedkFhz4+{L`u@{S z`ss_O=*e%m=!wTY^zA2H^z4%^`tH*%`p(l{`rfmCdi)!c^!MKk)3?7Bpl6;A(6jK* zJTpb#f5t`6J?o->{H~k+;k!Qi$M1RQ#pm$+eGk3#`~{nANq zzcEU`d(%ljf6Yh#^m8Bm%l~xI8~@8kue};VT7Z7>vjDw%bP9O^dgGr%^wz(4>0jRn z&~M*#(K~N>=(lfs>G!{J(YwF#(jVTPptt@tK)-n_NbmkONWcGGh>rb!oR0m$M}PXi zAv*D%pH98+rqds|Y2>(v-a8he58eyW`|lexIufMuu>ehs`^Y^WB(FP2K5vNJt}uBf z!ia|{;0sZ}KSja7B!z-uG7N)y%5sZ(hNW}l7A1GN5@4Vu;~*lboPq~H%K*bm{IwDI+)SJN!w**`odjUWmVtKsO8iYs zjDu^6bzDZ_&j#?~6-G z{#fC;QTG36P0{$H{Iuq_0RMsn{6Nwo-&YI6-f^g>r%V3p;a7(W)DwPt?qC2(PhSPz zpM>X*k>JpG*hTq2Sb_H?;Rnl9Ub0{F{W|)h@CA{MZ;K%1f-(4+KT-HQ2fMn^fG#-x z6f$ka?fk^7we}wqKQ~FcQs$3*N$CHGN9i9(3f~Tx{0RTKthN8>_G;W5GXM4a1=SY( zQTh*Gz9-`P+W`XpU$SS<K6>p`WZcdDn@@hAE{YFG{>|F2akQT`*=GRXKNHAhP@JvP~EhliOB zCVw1#DBF(%)2+t6ii5n|wyU zP%V-0gDsl=XlsXui@|fve=}Wv?{a=gm{pp9r1)bdq>6A$TLuR3TO5}&+=EG{EFPYj z+}?k9C0HE~UxuvQ2>;DI=6C=7!xac}i%P4i9J0S5tSXfa&Mj3v5Xtygz~Hu9hldYw zBt2&<`Z{X6KHUPj?f*#Hh8GJ-9=sPUb(m2-Z4Tw@H@IjXiGcxg`K0crNd3zy3~G? z_nDV&AECaUQ`l=dsc$Ftn3t$M=H81=$$jSjzB6*Kc^U6D`$p;D-V=27Wq|1)qmLXI zqn%q^YOlG|jXkPM?kz9dJwf~Txaq)N>?`}-bntTCV@}9D=AnaQ^dGKq)6LhNq)&eQ z1bq^F$-54pp!@Gq`@b*V{Q=!~*BN@?o>TPsd%X0e`_9mpzc4}%{`Dw5`p}=~{(HUj z;1}HV)rZ{l#Mj@Gd$;GGIxhEaFMQ_=J^!qeUipU;^wSqUz&`FYJ^8qcp86*CaNly# zGf(;GJKts>h}ow-|9wCG4PW{V_oAAM?q*(#UZ)jh>vKvuC{Y{(E6M{y~^d zot&bPQvn(~6QnU`nA~T5H0}&w&lE8COaWhXk7V}6zeN7OaiBFP=VA=t^*M`TT@Dg= zA+J6oW83iX{)_~N{F01}4tV6RR@pX75Xo=Q`HPTXx}1y*#8I{r_)$N~H<+1-EI0EN z{>qFDCdhQC2k}UG)Q|jlhx|3b517p+eO8!A`C3Wey2u8d0T#(Plgs!O{dkZLPqjL( z@GJi4G+@iuaaA5TI);Z^GjimgBp@flX0vJfRsJ3;WhxFdTt7UPk$W<1_{&l`C=7@E zNc(_ayP}MYg&bdK@<-v<`MWYQN;zJdBA+pHehhxpzlv*&b%2V}mpWhZ_wxGIh6Z@x z&nanW1=BSBDxd3Q*P4-0&0+NY$L1ql_M;q={_1JoFY`y0kMvJ#3s4Kwk9_VQS+=a4 zxi-aM#BDiD2Im7m`j>WSr{te{MsMiYl##Jq=ME1y#ylHn@;$B`Q9i3)Is9$afvBUA{N@{;X*+@h(eaWCq0Ohx4@W4j<0bUZ){k815ct zZ^Fs6PNXZJEIl?&l|OOuTvnhmojy|PT7))1nna06tzZ~!Wso~ zbjZ+ia;7LRZwfN=Fy!EVxei&fCS`UM?zS4JKVI!0hxKN2l8+)U;blhnW4L;JC&*uT$1S6uFe?AlA$9CXpuS9)pR-Y{KxMToBd z$Ov6~l}pL02fcLj4P%f;kI~_ekI^S@K1(-T>!RyE>Z6Yx^3W%4n1H<63;Fao-T7%3 z-To;LeeMo79fAD$-n)JDz`YZ6|L6VmItkR zp7zlbe;=f8J*niu-+oHTgP;3ekY0GsOFx9X_s1_!NSW_*&l&W}4}(hdee&Z$ln?><}U%E|`dFF?=$vgLazM?|{lTPP&Q2Ab1; ziF7SEWZf-eT}0c5P(0DufuP-PU%nh3%$skwmoHygZ10L-R>Au9md7&8GV)K9kX<}V zB?$H3iq`|t_{m3U1-#DVke{Pzn-G_~ZaRVu^igca#YvolXX5xAx)e*N3y;kla@*`}NBz8&Y9e0F)yBz@_A7d>!)m>&6xi@x@^ID`DJ z6ZF`lZu&1@3DOha^wN|6!%t5?;iZ?KAEzJxFhECt=%&|x?8158S$gxA6ZE@Zk7Mk2 z(Qkf@bGo+!^zJ(W`rp3`kRN+O-WLY^VVazrqA>hac*hRVy<~dkgLSyr5UQtdhvH6yxG&S#M!+L9xoqk^$iDanHrQ>X;+~ zpR-8jF91C7<=6`s^;Q&@KyGd?MtzIyImNxDiwX)eGYboWKc{%1!oSca;R`w6Jm6t^ zBKet_s{Z0~MF``E%c|(r#HvuH;-?(VmaY+VQ3ZU>2P)kBSt9nFw)uJ$TH`wZ2*yw2 zbMg8&6|!3#sY>h}&^Hkk%R>UPOX;_5o`7^TxvQ`BOPGQJLlhQXc+Ys5j%}O$2{b^5 zML-Y7q!T(c0&+*uxp7<+7lnk)CZxx>olurr)7j=1`3u4kI0NB_<%Q_nHjInKg(1Kzsr1ICMEd(Ko)GquNfSoF8hAED2Kx+)*J;y*8Xho= zL)Wdt_SQuD+grv!XV8Sjd?}!hB)Y(V>?h6iO)W0OV_j915P5m3eYy@!`0k!))4vGZvAb7wy9{;Xm~H z&e{Lt`LDj0*-#u?c5y*KWZBM-|LyBz$Dd^1Z#@0kS=?7IoSQor-!aA{{TI=TtpSE~7|v(*(l{xm19A7=Wc zLho6wm2`h7UJ?+yE=uI-Oz@_nKYsmyy>~*}XHpNtZrb1xiwdLbr82uuKwo)QcvI0I zzkX{?vVNN>{m>;B&~Z1%w8Di!vHOw_hyJ#>b=~^4iS-=5X+re(dBpZ^uYgXv40W8J zrQd>d_~vzfNjvoTP5L(Tf8WJ!j6Ko* z5KC8dU3a0t|0t?%BkQ|F|n8t~r=`UcucU!F#X^!vFfzeA4_nSJ>3x!5A8)2X~vqo?Z{= zOYZDN{`1~{rPKeD*P1#t2YW$l|DQ9*5V)t6lKzZ{?Bhc4A9uSF>gj3^2;MXDI-q=6 za=#quOe6D}X=k~Lrib??(C>qsDS$PbUo0>6Nne8J{JiLU((p6u|IWDiE0KQa{fXS% z3qQ_ldgH?jO@C$OpD+Em2PogU=D~)>#P1jP4oG#j@f6=EGR{nee|A^ji17yq`(^Wu}+I zYc<}lXr4g7Rp2gTO1z5}p1=Ho*ZZ;br?n^WV3o~>Ar z7hOZng#RA~{qf^J%PkM=OFe(_{Fa?{e)6Bz#yI)O1=xR;EyJ1yg4vMU~lUO?> z@|63HZEi?p+qfKi#-}~j+bGL&7U=RP(9YvtD*m^ub;tGp#I~n9ZfZD|QL&s&_i2_z zv~5V-(`xv1Lg)}m9%`KW{D{BTMV9lgwRNf2x#`ryFl*P~oH9Q;{@9EC;;I9);|t40 zcn;U}^Z60(;tSlHz`8IxcR-&q>HABUc80_Ke|e^<>nbe?2;8Ng6<*vk5$fDZ_00`U zF0pUd8Huw>o~NjE9;;#NU{-aNVz1A8U`_vg%mwT4PG-UbE9{moMZ5KkZ2umoiLV{! zeSC(X>*H~tXi-2^Rd@vSR7HJ_3*q#Bt-~c?|3N^XNaC`dNAOu?-uy|is@x-C);h)| zK8Y9Q*4DbjI`{_0fwLs`Yfvvg^M1p6w#2evrtdSiMCs?Y!p4P3zi!8$W5~4QZj;G- z>w8*|8;N16G>j=UD+eEMg=4 z&hE3~mYWjyb+fJK!z>SbE8yvfxU6?X!0yV2#=q=ik^81cBjJ&_@V?0X({qLK<>H_D z-X-ctxW^d}m+Beilioko>8Z-;bPbm()No0{?4wEO1|DwDeH`9Pgkr4F3O!di%e~Wa zeullJFo)gzMFAdfQ^<=QN>8f-SzF*Uh-1K&M3nKv7qEXIv{ znI>M=x6<{oo)zl}=<$HZ07)o*aEH@O*ZJogUSZkevRqQ*!F^Pzr=y>757n%nb&GU5 zhrEA_>Jv?2K1!}n#4x-Uw3fx)R1+_+w{@P@6VlJt`dK$Zr?Y%e^CjJ|Fh4r)&$j+{ z^n-Nk)o`r)qUoQme%5o*aH-l~kk2xgnK@ohXuQ+aujE>a*Qx5)c+NMRuKsrD>1n*y z`e6^uOxOA68{(d{$-nsim#Y1&o4|Sl$#fEMzg+4fXnN+(HKY!LsefS6WnjGn+{I2= ze|HoC54 z>v+`HbJ}b_pZVD^#<1tHM#p)4;b&d94q0v_$EUb542wJRCf;=G=d)prd$u9&=g+wQ zy_cMoZO*o_Y(se)WFQ=8Sx7uhbI?u=$8l@^bl;zq|CjcRm~`s*l`7=3OkD@;FeH@Y zvrC^6w*P0kouRl4=>-f_z0BcDxa`ez$XUq6pIsxH{5Fze^D zC7nLoaJu^WoJHg3HMxF&u$3q}THT_%BjVfLkd=7^?yw5j--tPvWtlk7qwUDw)-@q; z7Z%?_RBka{{Yo!NwRI-rFQ0{Ix;LzgjxU;iKKs!5A4dIaYNGWk{c&Bh3i)g)o%&hM zui>ooFU$6)lj-X+)-aWv8MaDLhjQ`bFUz?#4r~3ao2k=h8^Zoc%KB5y|16u%iIGc3 zpXIf>efuF-(0n>q2)i|AIoPyGyIl7sJ_lF4 z?cF{m<*fRd&r#1+ug+&#sxDVsm3}#vm+Ep_PO6_d^C@be<8gQ)||(%Bt2ZUCc7n3)kP$!4)s- zTT;lfzkeGVU_S|UC3h^}ipsW>T#MyUS}vvJStC-GrRin84whjZfb3YqahW}kRk7S^ zU+-Bdv)YR=d9CM{s^vK6S6Y>V{fS1{icr2g+z9&<%Ih?Q3#0ZYOjy{SKzgV7tZ^hs zKdj3ifhdCgQAjc%zgU=Pf1-leebj2tS*8#*uk%V>71(Pqd3f1wk4($UgB(3g4?7fQ zdA=*f`Y*6mCF&jACkz9&BTOR(IP*iC`=nuDea)WFXRV=`&M@qkLQgwFGOdw&V8g(C zY&6s={M~J5P5krc8wTrWbhdd6*orV5yrnCB3d4Hxx_wsuz}6Ykg|PAm z_B;e^e#H2u#!2j>4EcS-)`);zkeGbf|A@n{_@nsG{l{g#Urk4RxF9dgdJN};v(m5o z66~g!<+?k3#`;FTXle9wXsmDYi;D6f`iYdY8<71QkvtQIb)+>tR{XHNBKgC5+d6;A zBAhwn{qh;J3KP#C;?tKdN#1`He*PB5O!^NEdW@^D^a|Kh6noCTGCT zivjy9>;>-7Puu@Z`kT)^#`1klrAMM$s>12|e=_=ab~}x&9Zs>eW7OCNzqQ@TbF3kG zf^P+Oaqzu3+4C7Z+KurcRsWa#H;nccr^%mr^Jd=vQ{ji50=!qlz4(mr z(hrn*YoWu@7%K;EaOiIqXT*{DWo@m;e7~Bn@nO2-59_yayW26pz*drs;~tf z){(*fmXD8_aXbsyRx1DnF8&m?esto978n6)+gF9Nw^fB0;5Xm$lf%TigZ|Ji!-o=ag zZavE>k~>}-HPor{tVdl99an4lq9PH|$4_1!wp|j+V@x*dU$W%f{R?(nBz?Mm*nct0 z$Jbg=5Qe^Ibp2t?H_M~`8adWjb5)$_%}Q|xR+nd8bG_f?zN_!KaHzi*t@Fmu^|i6| z%knFe_gmHrfDIh;eQ-RU|Ehkqe`?<_0Ua3S>#8QCyoA3w2j&_@qev(Z+d4vxwL}eT zf?`E^0Pj?VQr^Pj9(cUGOpOKc^|S5-zFU(mVo(r>I!aDbOw(iKB-`CXbABPr ze_xTqDpA=h&OXTD?OpFYieL%Jl)q#K-VI*c~LJjj}ZkEhpX9Ew6S5iT~hs@ zHZ{Aes)qHic`ko+o-8k^?m`{9TU-BFngOQVsVyb}9%XjXG9p@uzf)J0H(MSlLR@5# zz@_bpn=VR6Gm9ZRPf{q;M}>BrcGy4WzDl}Rqn+D7D^hQyi*1WigUtMW&sgOBg=vFFDIX0i67@lvtnz9tvQ+LFEN zsqI~ZsGnhfL*3uipnrkvpf(P2mtKOj=e=hpnNbXtjxV_v_sbQ*VkpspO>WsM1Jt^g z=}>M=8GdQ~j6=xrckVHPsTEhQlvhS@6PKK>qn61+)BGWYuR1-OiB6|D#H{G**WCMU z7Ojw_FmoiGKopzBQif}mfbt}*Nx#=0R|fduXKf?AmwpV4CwXlyH9TuZsz*IDPdUzp zf=Qn`#Y3m}5kdC~FQjRW6bSZB>{+$D50Lw=w z__uHwO%&KfYBBSm*k})1^K)m1_$vtuPloL$%FtLc10zm`(t#~1C;jT!O-?!=CLZh; zY7`8p=AhR@HSuqLR(b1vE;fq@zEXxLQXwjKqib!al0U;`Z5E3;eozucgovTKvmtwW z2hsdivz+MA`Dj?gT>eS_Fn^xqw^mPe{^LL4T9tbL@mJm0HWfi}tl*DLzqD`(!{xcm zN7F|bP^ChID>d_S#c_)0XPKCJ?S0k=1?9B$x_lG}WCM15)31KUs>u{it^^nFTQZ`j zYo!YM9Mm5)3|0&dvwiN7@=mkXb-hj@p*R!N@o@|;Ch_WRp!FE()xz-d=Z((OEo!Y# z>cfhT7@CRAiGh4#XFEG1UV(-&3^!hn7b3^sqCE*Zr<%o69jZ?h$C|{%@>}5IU#U`6 zpT|VUPRQ1(P?()IjI)8q&#rnm-~K&VK(Wdtd7MA&iIwQOoLr z-)@#1K+Uj}HUS+e+ndnnEar&xzHQW6)4%yX?OvXF#F7zsX$h+~mF&!qIjo9qb+-}? z`BUzko89+CcTomPM%uO&RN?KM&I9duMiELnkCYB{-OYD>*#-m|)EtROc$kTY2T3WMCQFizMI5d4omQ@09H7~ohT|{Nm~sGs4~B6{=$3+u{i)OxJRBI< zmM#9hNFxJm?qbuWIAg{k&|RyXmOc~Eb-En!-#^ha8t;}ymwR$Jd%Fm_zB6cc8?Yn9 z3^HYG%=z_oZ{}eF(q20ZOQStDj3&f)ZQEV2(Q>smbz$h8M5io3Fmx6$eQhb5P;O=) zOQ$Ggg`4seB(Gb%s4ZYneKZ1r;G}81FV))T`@1sEd`8nV`EnG5XEaJE@tZ`L_M;q2 zZiE2&mBIUY3!e(xwC~`sx~Ti5--zw^glhw~6Du7H^sILb%hAgc(5dD6g}5d}WW@^b z%}dbFcXmS4cbp>l&uuyd2`)nG2U>=6Ng2J=b`RbQ_HpP}>MXUcPmI3v+Uv!~T83Q5 z+zWsB_E&teDL@$b6j{0JX^=l(tWKH0)X9u4ry=bucJ@`67@e0rpZsb!&zQgrV=9w& zS~s%TmW8=j-WO*a>)7j_WtE#}bl|KLfmLXO8=S39j@@!@_1RG?I|6+Tt-W)8*?BoAOy(|UznA5JIzjx`NwnMeMOHK(49fr9zac57$f zChSys_*;87()*@2lyo19l`5YMX|&`#S~Kj?t^K=$`sP@Uf^aKvSPR^ZW^~ea??~xA z2LqK%K0OgFPX|#id^T9^cWwykTeI%qRVql(8T9GTK8Yb4a5H>Md*K%nz}9%D$Sv1H zO8kzT6qCO(ON_zx%FSfNcAQj?k$LWuvHMbWj<-?Gj?axiwW&#yTZ$_X6-xcb?%(2`&M9CM4lwX_KEhi9K#DyCH#Thvsj`p+*pTr2<|OH`pY%H z?8k>5j;??|K7HBmrS|!oQJk;vw*2^6#qj9;jRqnGk;{(+bU(HOUVv3aPhV&%#pcuo zf~=t1H}K?6xxtoVJcujk@X^z)a@rc!!v03=>3Bn#<-pD*9&UyB=4XO3%kS#}t7AI0>`yJ69bVdN}jWXkns z&GhI;B+Gmmsk5m$`+ccPJd_V9DW{3c3pLdv{*~B1t37wl2h%M<;d}HclH|u!St{oj z(D9D`h&Q=E7Gk^bb7uFI)NhY|4Zs~kCbz|u6qKR{9_F0nL`na?+uywB})Ug#Cl$9ROya1C}UFStf*3Xeo>OD&77(wUfUOcG6oi9 z>S`#uF8T*Ud5$>;=ibjf)IL82n{Wx0#XtU_+->B=2$v6RQMd<4C|I-%HtpUB=I`Mm z_fLI^{-h*OmbjR&w*0+SVq@r2f25OA+8jeL0tnHu+bdfpzYHt6L4M7iy{~#tf6clp z1knsa%Z!|nG!a)e7`Ila&4&>FFK71}nQCFo)I`;3}?WwCc|7ug#=~ zH&$e`tZfY-s#_{YllJXKqt&f}oBsZS&FfhnmgdYN^T>HKczavlli&>XLh%X+dAX!I zY=~YAvnOvwQL?30gepy~ba4}ocnFs3rI)5Wi{gp~p+b4lph`)K6F*OkBm)@GtxSvP zQAQpVOGZ1@V=pP+)I)pTb#Z7sX1#nA))SVarGEE=vYQ6R^zh_}Njz)!*;#Q{m`H?w zt6Q^|VszJ#L=oPyvn44q@`?U8&-UAhKCh3nx2WiMScFYo`8dg1vH%*JzPO_I#qKX| zuQabzF4UyVWR>wl;i@BqLZthvlNaxG3aL#=){UwQ81~r@?&!FhZ!M|HJC12We~|vD z^Zs+!25H3d=XSES98^GA1)Fu7?8MU z^@giO3b(Xi><`jjfwX@Dx@WC3HHFx_I6;q*H~a>^8&xOcHlxi$ySzkzo8xHLn=FA7 zt=4Zl|KecoKqdN3$|OK}T8!a<@K6v%f|Leq*Jpy%j5%LSV)+5fA*`#~{cN_*-Kp&# z7;q|}Z^CNi(w#A(3>F|@wr8zeRtKolb>7z#qXyxNOIT4Z{!(LR`bqJ#*JQhIvA^^R z#x6}A;Ev*^xp?oQb+*Zk1&Sm>zYB=}i<@nY0IJuIC%LLfop;b|O!Dkfjak>w4E0^D z-)ywVwN#DUi0t$F|6J0$1gyF7h!Nlw88qc9&*$28$wtw(5VnGvFyquyqlk6UkMLZ# zrulUUuRGY+(?_}a_1xzE*kRP8&OF(V7DFRVspPRj!cSujvyS=KZ=C1%&z-mZk`yMK zH!SPh7~?QN$n(hN0-Qa`a~*hq;%<*z%zds*`B*5b`7Lk{R(SUbZHb2u(4xVttEmlc z4zsa(KV5WPMtlMqgQPH1BQ8-Gyy6+9yf@ZYTz~wxL=tS|}Ii2y%lUQQ?7hE1nN$`U@hW@;-J-cs3) zy()fifB^xsSua0(@*_iH_oxN82Br4s`oms{*fNr(O5D%AUlZSPBxyQ1Nm8xZcg%N{ zrsV`l31g6)k$xiW6T+_|(EMVTb?*(GrR){Jyt(w68@tg?gcqY6WG5sQBtT0Dkb#i@ zO|6Sp_eTM`;~C+IwtYHaEb;PlRN*wg zVHCxMdf#p)Yg4QRi`b4pyv5Sl1sK>d*xwza`T*!os}j#K9l2aJ(QfmuS&xcIOVIB< zLc*AGGyp>bW^uwN{sdnOi400LoZspUAk^W(hf=%>D1XfQcP&6TKz5NW>ID#J(O9J# z6-oRll|4D>c8k5@w*uV`4ycbcw-h|&ipFPdD_UHoo@!dRYlsC86E7b;SRonNtX73{ z3_W973i{a}DaO#OMT@H(J#05~qI`zhjM$b|4j5K&U$?y9JDf$~-HFA*cp z*TPG_3Ol>eisVJ=c6O<|^>8b%Y%4Kms8+GR<*YDE(fbWk?ax`ol%kYtP&80q;nhXf zrt`hcj*)(@AK68HY5c8+U=R64v;D?QM{o(Y3s{c+AEDd1q4zg2F2N{u7WGt#DxBTc zF#mx8``x~LCvd-#4Ml>EUHb+CC}U+JdF9AAEA4Y{V~1Z;rcwi?U*5(YFOiMXN@tUJ zYPlKy9Y!8D4;n6-M3M%cbVt-|bo5B6H$F~S@UGRlG~QTtj(Bm;sv&3yC?h{i0m<0bzY&-lIR?R=Z$IpOJu&{+YolPZ!9EZP=YpW!f4 zo*7Oj?<4O0#WU6~%wU?|*h-`HRh>QfVe%LO0H01bzwVkemZ3~H@J=5Kphf3x|NW+Y zUbWeXRF8Q$3n!YdmM1pzZEa8g5AR0|LiUd*9bwRG+6i+GzNWQ0t<%R z5Q5fS_!Q+?&J8=^B5S4!vw23m_XVo@->XV8^Wu5V4_2nxjgtw1zB8km%mtLwJs~M! z1^(&GMV&3!`V*qc7EWLb+eh~gXlJ7*+FYfh}L+l%^U@T{K0OGqy z|3zf9)JZ9jh-hn6Grm~@*Z-q9hx?Wi{o7qV#kk~7@!ql9squn-s4Yecz{wypr?JX# zf!qwz`{LP8oXytLGsXl(MdR*$tle@mbH|E|s%ida(41ROVh;GO@6UU}`Ze8ApOo5v zS&g3F+S$(!;6==4hTS01d8d52hVI121)${*;!O>#}8`M|&;VneP-VYYN2{Rf#+`+g9CUFT@R+cMpz-2J{XJpJXxC z|3nrk>yma6hHFf2hkPUG@L}aZ?D{U?=j@{W#{SePA+Ht*HOV?2_#PWAv-8Ipfb`Fv z)s-v!nni;}1&U*$NXt^oUvug{S?xqz&3GD9ief?H-f3YB?x37=uURy<(+!;_wPjGT z^y)zCVqueb(?f5yLNvt`=0LX0R`zu9`IZNWE#oqY4@Jyb^xgDJr6KH42Lz3x29r<5 z4^5Xs?TfJ{@Xde!Y_?OH#xjk9hXRDvhZ!tRGYo_}CfXb9zj(iPk=}E8 zp!Kjr!iM@~g0v;d)pnX$Y7bdADoj5vr9Yu-p}!)*Bl&<2;1ca;UFS<~0cFUWX6&OR z`d^b}#$u23eGn93g!#z{7Yk6frrY>0e{C8jD0(<|tFhD~z=%7@cGGv6FKi=$4&afl zCgSvfA0?Zs@(5|+P!W4VAqd_p|1K;yr2(fMTmf%8wNbK~VexzE{0~|mxF1{AasvUGtubb$_$c6AZzMm7uh`W5X( z+$j|FgfYGJ8)ShoDVZBJr4SbwjW~-_@vgQnhQCiSe6_7>o4C!Ud!nCE?u<3|=)1iQ zFg%DV5&erYE#`jNoCB%LFRSqx=l*jW3!2NgbqO7QM=GFR_T7EHC#;>)i3L8ubE@o| z%`@>v6@h1$ZrfMexisBSG7kN$cgfNS0QXv+K>#zO}prMPl4GM;Amc{R{aW=`cKiZFe);f$zebBY+yH^4k`+x($q&yEDT)SDV# z+(z75#L3}_64qb5DA}{++^c%|`rnn(Nu25q^6c*qqrmS@A}ZANkej8W8K$5C%(||v zH=T3R`$qC;oQM*U9G>^_;GkKzp`+u<{*wAmo>(xQVggek;0kOM@5JUU&;xEehv{p)x~P++iKd-rznEt!~muC+os5vtiE)?N?S=1=>h(&MmimH#Q+k=G^JC2AJqSh&ackOnSxio zCbt9a#ruMqUuCCWgJDBV{tkn0#__t`JYh65PWRXSghift_89atyoe0Y-{kMYEa__g zVEM5wnXEH-VUnhIH&UxeI@ADo#a$?=% zI{Axzvt2eXr)cyDbk&=q=AbqFYrf zO`Z4_*zoy%uPjUi6p@XMASVWjq40>Dch~xaO;}8^r8|Q~i8@3*vlULJcy_kYS-L~* z2~ET`?)Xnr30*hSJ9d`1yULI;3$6aYD`VJ0<_BX}Kf@z%%M!G9G=DM`x#D!DG=vswwq`t$+>!ndqc)H~M*tRa_UL!qx(Du|>)|h(Np2n7Rg#qy z&Pi8N45AB}UQK6gf(nkj64Ywm%%KI1s99u0z>ofK0b>p@YLLAt2EWU3{q4t~`Y_F> zT&qJzPT)y6N&>R@^o3$-vBbL3 zBlJ^3p}sX1n~i&q*4ZLBkwb`ubn>2Q5`+h|aPUX~!VglmUb{dL1!0aD0(i*3a`{0z zkHgu>Up9Pxu>x@vY2JG?!To3n`L-lW>1l3W5wwjL(z$4lDuI%5pRq8MzH=)G6QCCd zs22w7)5z${k@A_=oXrSVa6^f^h#e4mi=UJOX6-!VDB1X?fW+0~+NEknexkm{WQvsZ z&YN{5n^zR_kMH%nl%63xv1Qz1R+!qbjPb|EFiZ8@4UcX%TCqSWll~l|SYl5ll3n&) zD~h6UP(Esf>4=;_=Fkx7rhxQjFOcu!uRB{m4S3vL>@9cjQc))(c{`l_{BAN(FXZ34 z5HKN$7a4iJl8msF(~Vw2nDI1=%r+C4FTFloy2=~lo{P2lf7CbB5d)buP<{jCS0}d~ zgC+)ZI6$cP*7_buy6&g4;Rt<=d15lBk(id)mkzw=lk{w4=O;uY!oPBzW<8GN#2!Tp zdd-T_Sb8c*Y%0C5K56U@&Y=974VE3)5&GZCl^%#JWw)YA z8UL1PBb`@T@&L*)tQriEjQ~m`-CaN~5WNg^ma=m=L1+c{E>NVvKGDuF!>Kxn@4iUS zo-jxasDVPOpHnAejKU~80~o=5nfYwHYeU1WFB{wUnOQ^s$~7hx1xiZhe3{Bx`tPq^ zE}Eve2@i3CRG+|*6NkhG zVJ);EHyOQ$eF$hzgfO^Q44$YP!rsF?8Jzp)y9<5id!)O1-giA5cjb6#G6$l|T)oaq zKGw)@Ol9d5OwmW7)mrwO=CwEqSdSis7Zb9w~D-xQPHpo11U9gG2eFR zU^EPG>nQoEWP(j3M`ah))^oVb2%KVJHvqr4f`^#M8S_G`V!lyMx|)jO(sBTk^ne18_w-8wUU z4QaqdYsQ3JR-HBOMR!;X7{|evZ*W^r*#aXtcXER8vVMHCIVd%uA)}cf)))#kOWWex zHcg`Jknv-Lv`Es6GPYu_UN8^Hsz6D6gOG;5&*cukUh=~f$grt0SY^hb-)>X+EB5%OGn8yoz?jCZjQ z0@iu!q8f;;%|_-a@Ei}<$h8c9A8udm?-DvB7ztuB()o9F^2_R`vdF9oouxaYmWIJL{Pj|Dxa_U zPE_w>rT6Fy(Eq(J7EU=bnW{VUTw8QY8|_bxz?Y<0=YAYED~YHv9N=-Zv>iEI;*KxD z!cS8*1c_di4HpW%6197FD_K4wl9R?ZTxqa}5_YJVB9#y)T=VNcE_%PU-NxFL#B4eY zI08BDpXVf0svJ_4#0uy*H5iZa@o&c1RJYGzad%62-QVrm_5$vDz3qo%#8lrtAh?>6^<aAS38LWZZ$ZYmrxRK!Y+y5(@rDFryK650+SyVc-_V~F* z+Ab&cHXA^uN!}vqiHW06to>{^-g@=_`e$-`2tvw{(aNR!@+M14ao63H`Nu{hHGf+d zx!~Qnx$2oun>=nbGlZ<{;Av^UhD|A2mu;>BU1a zqVviPkbTVdy^Y5B1Ua+OTKai;wFuI*ZZ|i2Z^u3vu(GG7bn14p`$kj6NT|ETu0Vz} zZOGT>2V(p_laW%sG${Xr2;SiuNe>(qt z`T3#qOM~0zssMoMy14aw1L+%$er7W|>bRy>T#rS4P1H%KL2v2pRwpB)iQFW3=sq@! z!)x%DaL)S=y>;GzaAmU+SKcv1WduOkz;+K@`;qHHS8kKJGDI8_J(V15CJvRLtyLgSVHRbI#`@5{MtYWxLvm&G$c zyT^59zuxz0EsVS>@hXt8?PrQ-TLl(G1*nsMK^v(|{ + + +
+ +
分润对象:
+ + +
分润比例:
+ +
+ + + +
+ + +
+ + + +
+ + +
+ +
+ + +
+ +
+ + + +
+ + + 添加分润对象 + + + + + + diff --git a/src/components/Banner/form.vue b/src/components/Banner/form.vue new file mode 100644 index 0000000..d23cba9 --- /dev/null +++ b/src/components/Banner/form.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/src/components/Banner/index.vue b/src/components/Banner/index.vue new file mode 100644 index 0000000..7bad458 --- /dev/null +++ b/src/components/Banner/index.vue @@ -0,0 +1,280 @@ + + + + + diff --git a/src/components/Detail/detailsOfDistribution.vue b/src/components/Detail/detailsOfDistribution.vue new file mode 100644 index 0000000..a99e610 --- /dev/null +++ b/src/components/Detail/detailsOfDistribution.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/components/Detail/form.vue b/src/components/Detail/form.vue new file mode 100644 index 0000000..d23cba9 --- /dev/null +++ b/src/components/Detail/form.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/src/components/Detail/index.vue b/src/components/Detail/index.vue new file mode 100644 index 0000000..7946a61 --- /dev/null +++ b/src/components/Detail/index.vue @@ -0,0 +1,268 @@ + + + + + diff --git a/src/filters/code.js b/src/filters/code.js new file mode 100644 index 0000000..28bb03b --- /dev/null +++ b/src/filters/code.js @@ -0,0 +1,292 @@ +export const tabList = [ + { + title: '首页', + code: '0000', + }, + // 公司概况 + { + title: '公司简介', + code: '0101', + }, + { + title: '公司领导', + code: '0102', + }, + { + title: '组织架构', + code: '0103', + }, + { + title: '企业VI', + code: '0104', + }, + { + title: '联系方式', + code: '0105', + }, + // 新闻中心 + { + title: '集团新闻', + code: '0201', + }, + { + title: '省公司新闻', + code: '0202', + }, + { + title: '公司新闻', + code: '0203', + }, + { + title: '图片新闻', + code: '0204', + }, + { + title: '热点专题', + code: '0205', + }, + { + title: '媒体关注', + code: '0206', + }, + { + title: '视频新闻', + code: '0207', + }, + { + title: '专题片', + code: '0208', + }, + { + title: '企业画册', + code: '0209', + }, + { + title: '现场风采', + code: '0210', + }, + // 党的建设 + { + title: '中心组学习', + code: '0301', + }, + { + title: '示范党委', + code: '0302', + }, + { + title: '党支部达标', + code: '0303', + }, + { + title: '群团工作', + code: '0304', + }, + { + title: '党建动态', + code: '0305', + }, + { + title: '党风廉政', + code: '0306', + }, + // 安全生产 + { + title: '安全会议', + code: '0401', + }, + { + title: '安全生产记录', + code: '0402', + }, + { + title: '应急管理', + code: '0403', + }, + { + title: '三讲一落实', + code: '0404', + }, + { + title: '曝光台', + code: '0405', + }, + // 通知公告 + { + title: '通知', + code: '0501', + }, + { + title: '通报', + code: '0502', + }, + { + title: '公告', + code: '0503', + }, + { + title: '值班安排', + code: '0504', + }, + { + title: '浮窗', + code: '0505', + }, + // 信息公开 + { + title: '基本信息', + code: '0601', + }, + { + title: '经营管理', + code: '0602', + }, + { + title: '公司公告', + code: '0603', + }, + { + title: '社会责任', + code: '0604', + }, + { + title: '关于信息公开', + code: '0605', + }, + // 审批事项 + { + title: '公务用车', + code: '', + }, + { + title: '领导干部外出报备', + code: '', + }, + { + title: '疫情防控', + code: '', + }, + { + title: '用印申请', + code: '', + }, + { + title: '业务招待事项', + code: '', + }, + { + title: '会议室使用', + code: '', + }, + { + title: '办公用品领用', + code: '', + }, + // 制度资料 + { + title: '集团公司制度', + code: '0801', + }, + { + title: '山西公司制度', + code: '0802', + }, + { + title: '行业标准与制度', + code: '0803', + }, + { + title: '公司制度', + code: '0804', + }, + { + title: '地方规章', + code: '0805', + }, + { + title: '培训课件', + code: '0806', + }, + { + title: '培训影像', + code: '0807', + }, + { + title: '科技创新', + code: '0808', + }, + // 部门首页 + { + title: '总经理工作部', + code: '0901', + }, + { + title: '计划营销部', + code: '0902', + }, + { + title: '财务管理部', + code: '0903', + }, + { + title: '人力资源部', + code: '0904', + }, + { + title: '党群工作部', + code: '0905', + }, + { + title: '纪委办公室（审计部）', + code: '0906', + }, + { + title: '燃料采购部', + code: '0907', + }, + { + title: '物资管理部', + code: '0908', + }, + { + title: '项目开发部', + code: '0909', + }, + { + title: '燃料质量验收部', + code: '0910', + }, + { + title: '安全监督部', + code: '0911', + }, + { + title: '设备部', + code: '0912', + }, + { + title: '发电部', + code: '0913', + }, + { + title: '维护部', + code: '0914', + }, + { + title: '热工专业', + code: '0915', + }, + { + title: '电气专业', + code: '0916', + }, + // 其他 + { + title: '光荣榜', + code: '9902', + }, + { + title: '今天我出境', + code: '9903', + }, + ] diff --git a/src/permission.js b/src/permission.js index af7ebb3..d996c0a 100644 --- a/src/permission.js +++ b/src/permission.js @@ -20,13 +20,9 @@ router.beforeEach((to, from, next) => { } else { next('/login') } - } - - - }) router.afterEach(() => { NProgress.done() // finish progress bar -}) \ No newline at end of file +}) diff --git a/src/router/index.js b/src/router/index.js index f0da2bd..f1d90b6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -35,7 +35,8 @@ export const constantRoutes = [ require("./menus/approval.js").default, require("./menus/system.js").default, require("./menus/department.js").default, - { path: '*', redirect: '/404', hidden: true } + require("./menus/others.js").default, + { path: '*', redirect: '/404', hidden: true }, // { // path: '/dashboard', // component: Layout, diff --git a/src/router/menus/approval.js b/src/router/menus/approval.js index 3fa7281..6af8039 100644 --- a/src/router/menus/approval.js +++ b/src/router/menus/approval.js @@ -1,6 +1,6 @@ import Layout from '@/views/layout/Layout' -const commodityManagement = { +const approval = { path: '/approval', component: Layout, meta: {title: '审批事项', icon: 'dingdan', noCache: true, affix: false}, @@ -57,4 +57,4 @@ const commodityManagement = { ] }; -export default commodityManagement +export default approval diff --git a/src/router/menus/building.js b/src/router/menus/building.js index 18bebe0..9eaf41c 100644 --- a/src/router/menus/building.js +++ b/src/router/menus/building.js @@ -1,6 +1,6 @@ import Layout from '@/views/layout/Layout' -const commodityManagement = { +const building = { path: '/building', component: Layout, meta: {title: '党的建设', icon: 'dingdan', noCache: true, affix: false}, @@ -50,4 +50,4 @@ const commodityManagement = { ] }; -export default commodityManagement +export default building diff --git a/src/router/menus/department.js b/src/router/menus/department.js index 5721c8c..778c5ae 100644 --- a/src/router/menus/department.js +++ b/src/router/menus/department.js @@ -1,6 +1,6 @@ import Layout from '@/views/layout/Layout' -const commodityManagement = { +const department = { path: '/department', component: Layout, meta: {title: '部门首页', icon: 'dingdan', noCache: true, affix: false}, @@ -120,4 +120,4 @@ const commodityManagement = { ] }; -export default commodityManagement +export default department diff --git a/src/router/menus/others.js b/src/router/menus/others.js new file mode 100644 index 0000000..d01bd38 --- /dev/null +++ b/src/router/menus/others.js @@ -0,0 +1,25 @@ +import Layout from '@/views/layout/Layout' + +const others = { + path: '/others', + component: Layout, + meta: {title: '其他', icon: 'dingdan', noCache: true, affix: false}, + children: [ + { + path: '/others1', + code: '9902', + component: () => import('@/views/lists/index'), + name: '光荣榜', + meta: {title: '光荣榜', noCache: false, affix: false} + }, + { + path: '/others2', + code: '9903', + component: () => import('@/views/lists/index'), + name: '今天我出境', + meta: {title: '今天我出境', noCache: false, affix: false}, + }, + ] +}; + +export default others diff --git a/src/store/modules/user.js b/src/store/modules/user.js index a61e91d..d4bd822 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -51,11 +51,11 @@ const user = { loginByUsername(username, userInfo.password).then(response => { if (!response.data) { reject(response.code); return false } const data = response.data - if (data.access_token) { - commit('SET_TOKEN', data.access_token) - setToken(response.data.access_token) + if (data.data.token) { + commit('SET_TOKEN', data.data.token) + setToken(response.data.data.token) } - resolve(response.data.access_token) + resolve(response.data.data) }).catch(error => { reject(error) }) diff --git a/src/styles/index.scss b/src/styles/index.scss index 06c710b..4f21b26 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -65,6 +65,26 @@ div:focus { float: left; } +.pa-1 { + padding: 4px; +} + +.pa-2 { + padding: 8px; +} + +.pa-3 { + padding: 12px; +} + +.pa-4 { + padding: 16px; +} + +.pa-5 { + padding: 20px; +} + .pr-5 { padding-right: 5px; } @@ -134,6 +154,10 @@ code { padding: 20px; } +.white { + background: #fff; +} + .components-container { margin: 30px 50px; position: relative; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 0344970..bc3b645 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -59,15 +59,23 @@ } // menu hover + .is-active>.el-submenu__title { + font-weight: bold; + color: $subMenuActiveText !important; + } + .submenu-title-noDropdown, .el-submenu__title { &:hover { background-color: $menuHover !important; + color: $menuHoverText !important; } } - .is-active>.el-submenu__title { - color: $subMenuActiveText !important; + & .nest-menu .el-submenu>.el-submenu__title, + & .el-submenu .el-menu-item.is-active { + color: $subMenuBgActiveText !important; + background-color: $subMenuBgActiveBg !important; } & .nest-menu .el-submenu>.el-submenu__title, @@ -77,8 +85,11 @@ &:hover { background-color: $subMenuHover !important; + color: $subMenuBgActiveText !important; } } + + } .hideSidebar { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index f415670..40a410e 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -7,21 +7,26 @@ $green: #30B08F; $tiffany: #4AB7BD; $yellow:#FEC171; $panGreen: #30B08F; +$gray: #aaa; //sidebar -$menuText:#bfcbd9; -$menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 +$menuText:#333; +$menuActiveText:#a90500; +$subMenuActiveText:#a90500; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; -$menuHover:#263445; +$menuBg:#fff; +$menuHover:#b54343; +$menuHoverText:#fff; -$subMenuBg:#1f2d3d; -$subMenuHover:#001528; +$subMenuBg:#fff; +$subMenuHover:#b54343; $pageBg:#f4f4f5; $sideBarWidth: 210px; +$subMenuBgActiveText: #fff; +$subMenuBgActiveBg: #870400; + // the :export directive is the magic sauce for webpack // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass :export { @@ -30,7 +35,10 @@ $sideBarWidth: 210px; subMenuActiveText: $subMenuActiveText; menuBg: $menuBg; menuHover: $menuHover; + menuHoverText: $menuHoverText; subMenuBg: $subMenuBg; subMenuHover: $subMenuHover; sideBarWidth: $sideBarWidth; + subMenuBgActiveBg: $subMenuBgActiveBg; + subMenuBgActiveText: $subMenuBgActiveText; } diff --git a/src/utils/request.js b/src/utils/request.js index 7ce4c0c..4a87d02 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,7 +17,7 @@ service.interceptors.request.use( config => { // Do something before request is sent if (getCookie('access_token')) { - config.headers['Authorization'] = `Bearer ${getCookie('access_token')}` + config.headers['Authorization'] = `${getCookie('access_token')}` } //如果参数value是空，就不需要传给后台 diff --git a/src/views/advertisingManagement/advertisingPlan/index.vue b/src/views/advertisingManagement/advertisingPlan/index.vue index 701e3a2..65cd458 100644 --- a/src/views/advertisingManagement/advertisingPlan/index.vue +++ b/src/views/advertisingManagement/advertisingPlan/index.vue @@ -248,7 +248,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/commodityManagement/commodityClassification/classification.vue b/src/views/commodityManagement/commodityClassification/classification.vue index 12b2232..23a9dcd 100644 --- a/src/views/commodityManagement/commodityClassification/classification.vue +++ b/src/views/commodityManagement/commodityClassification/classification.vue @@ -297,7 +297,7 @@ padding: 20px; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; margin-right: 10px; } diff --git a/src/views/commodityManagement/commodityClassification/classificationList.vue b/src/views/commodityManagement/commodityClassification/classificationList.vue index 26c0613..ab90f9f 100644 --- a/src/views/commodityManagement/commodityClassification/classificationList.vue +++ b/src/views/commodityManagement/commodityClassification/classificationList.vue @@ -212,7 +212,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/commodityManagement/commodityClassification1/classificationList.vue b/src/views/commodityManagement/commodityClassification1/classificationList.vue index 984ebf2..4de48f5 100644 --- a/src/views/commodityManagement/commodityClassification1/classificationList.vue +++ b/src/views/commodityManagement/commodityClassification1/classificationList.vue @@ -208,7 +208,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/commodityManagement/productList/index.vue b/src/views/commodityManagement/productList/index.vue index 24e0dd4..75faedf 100644 --- a/src/views/commodityManagement/productList/index.vue +++ b/src/views/commodityManagement/productList/index.vue @@ -271,7 +271,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/device/group/addDeviceModal.vue b/src/views/device/group/addDeviceModal.vue index 47258d2..446bec7 100644 --- a/src/views/device/group/addDeviceModal.vue +++ b/src/views/device/group/addDeviceModal.vue @@ -27,14 +27,14 @@ icon-class="right" class="icon left" @click="toRight" - :style="{background:clickType=='clickleft'?'#409EFF':'#bfcbd9', + :style="{background:clickType=='clickleft'?'#a90500':'#bfcbd9', cursor:clickType=='clickleft'?'pointer':'not-allowed' }" /> diff --git a/src/views/device/group/index.vue b/src/views/device/group/index.vue index a0d4056..aa2cae9 100644 --- a/src/views/device/group/index.vue +++ b/src/views/device/group/index.vue @@ -29,13 +29,13 @@ 编辑 添加设备 删除 @@ -324,4 +324,4 @@ export default { margin-top: 10px; padding-bottom: 10px; } - \ No newline at end of file + diff --git a/src/views/device/list/index.vue b/src/views/device/list/index.vue index 5000e88..2659b04 100644 --- a/src/views/device/list/index.vue +++ b/src/views/device/list/index.vue @@ -38,7 +38,7 @@ 编辑 二维码 diff --git a/src/views/distribution/equipment/index.vue b/src/views/distribution/equipment/index.vue index 2ef9233..fe8a5f1 100644 --- a/src/views/distribution/equipment/index.vue +++ b/src/views/distribution/equipment/index.vue @@ -263,7 +263,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/distribution/field/index.vue b/src/views/distribution/field/index.vue index 8a37d1f..cd72702 100644 --- a/src/views/distribution/field/index.vue +++ b/src/views/distribution/field/index.vue @@ -258,7 +258,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/index/index.vue b/src/views/index/index.vue index 7060392..39bf693 100644 --- a/src/views/index/index.vue +++ b/src/views/index/index.vue @@ -1,269 +1,40 @@ diff --git a/src/views/inventory/detail/table1.vue b/src/views/inventory/detail/table1.vue index 8b1164c..758f8fa 100644 --- a/src/views/inventory/detail/table1.vue +++ b/src/views/inventory/detail/table1.vue @@ -125,5 +125,3 @@ export default { background: #fff; } - - diff --git a/src/views/inventory/list/index.vue b/src/views/inventory/list/index.vue index f59c852..716bc07 100644 --- a/src/views/inventory/list/index.vue +++ b/src/views/inventory/list/index.vue @@ -113,9 +113,7 @@ export default { } } .option-span { - color: #409eff; + color: #a90500; cursor: pointer; } - - diff --git a/src/views/lists/index.vue b/src/views/lists/index.vue index 7060392..47c67f1 100644 --- a/src/views/lists/index.vue +++ b/src/views/lists/index.vue @@ -258,7 +258,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/location/AddDevice2location.vue b/src/views/location/AddDevice2location.vue index 7200ee0..d7985dc 100644 --- a/src/views/location/AddDevice2location.vue +++ b/src/views/location/AddDevice2location.vue @@ -125,14 +125,14 @@ export default { leftStyle() { return { color: "#fff", - background: this.isClickLeft ? "#409EFF" : "#bfcbd9", + background: this.isClickLeft ? "#a90500" : "#bfcbd9", cursor: this.isClickLeft ? "pointer" : "not-allowed" }; }, rightStyle() { return { color: "#fff", - background: this.isClickRight ? "#409EFF" : "#bfcbd9", + background: this.isClickRight ? "#a90500" : "#bfcbd9", cursor: this.isClickRight ? "pointer" : "not-allowed" }; }, diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 5553a5c..d23e20a 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -9,7 +9,7 @@ label-position="left" >
-

趣匣后台管理系统

+

大唐后台管理系统

@@ -117,16 +117,17 @@ export default { this.passwordType = "password"; } }, + // 登录 handleLogin() { this.$refs.loginForm.validate(valid => { if (valid) { this.loading = true; this.$store .dispatch("LoginByUsername", this.loginForm) - .then(access_token => { + .then(res => { this.loading = false; - if (access_token) { - setCookie("access_token", access_token); + if (res.token) { + setCookie("access_token", res.token); this.$store.state.user.user = this.loginForm.username; setCookie("LoginByUsername", JSON.stringify(this.loginForm)); this.$router.push({ diff --git a/src/views/marketingCenter/couponManagement/index.vue b/src/views/marketingCenter/couponManagement/index.vue index 63b1dc4..ea63ff9 100644 --- a/src/views/marketingCenter/couponManagement/index.vue +++ b/src/views/marketingCenter/couponManagement/index.vue @@ -472,7 +472,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/marketingCenter/luckyDraw/index.vue b/src/views/marketingCenter/luckyDraw/index.vue index 2e58109..aaef8ff 100644 --- a/src/views/marketingCenter/luckyDraw/index.vue +++ b/src/views/marketingCenter/luckyDraw/index.vue @@ -262,7 +262,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/marketingCenter/luckyDraw/luckyDrawDetails.vue b/src/views/marketingCenter/luckyDraw/luckyDrawDetails.vue index c5193a2..db47b31 100644 --- a/src/views/marketingCenter/luckyDraw/luckyDrawDetails.vue +++ b/src/views/marketingCenter/luckyDraw/luckyDrawDetails.vue @@ -461,7 +461,7 @@ } .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } diff --git a/src/views/marketingCenter/luckyFree/index.vue b/src/views/marketingCenter/luckyFree/index.vue index c59a55c..8a967d8 100644 --- a/src/views/marketingCenter/luckyFree/index.vue +++ b/src/views/marketingCenter/luckyFree/index.vue @@ -262,7 +262,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/marketingCenter/noviceCourtesy/index.vue b/src/views/marketingCenter/noviceCourtesy/index.vue index 852dbc6..01c49fc 100644 --- a/src/views/marketingCenter/noviceCourtesy/index.vue +++ b/src/views/marketingCenter/noviceCourtesy/index.vue @@ -325,7 +325,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/marketingCenter/paymentOfCourtesy/index.vue b/src/views/marketingCenter/paymentOfCourtesy/index.vue index cf1a03b..7fb2595 100644 --- a/src/views/marketingCenter/paymentOfCourtesy/index.vue +++ b/src/views/marketingCenter/paymentOfCourtesy/index.vue @@ -261,7 +261,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/marketingCenter/salesPromotion/index.vue b/src/views/marketingCenter/salesPromotion/index.vue index a4b22ce..06e1da5 100644 --- a/src/views/marketingCenter/salesPromotion/index.vue +++ b/src/views/marketingCenter/salesPromotion/index.vue @@ -321,7 +321,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/order/luckyFree/index.vue b/src/views/order/luckyFree/index.vue index 1830c59..fe0e878 100644 --- a/src/views/order/luckyFree/index.vue +++ b/src/views/order/luckyFree/index.vue @@ -158,7 +158,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/order/salesOrder/index.vue b/src/views/order/salesOrder/index.vue index 61df85c..e4c8c9c 100644 --- a/src/views/order/salesOrder/index.vue +++ b/src/views/order/salesOrder/index.vue @@ -191,7 +191,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/orgManage/orgManage/index.vue b/src/views/orgManage/orgManage/index.vue index 08d34e8..4cb0975 100644 --- a/src/views/orgManage/orgManage/index.vue +++ b/src/views/orgManage/orgManage/index.vue @@ -413,7 +413,7 @@ padding: 0 20px 0 20px; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/privilegeManagement/account/index.vue b/src/views/privilegeManagement/account/index.vue index 743ef4b..4288a3b 100644 --- a/src/views/privilegeManagement/account/index.vue +++ b/src/views/privilegeManagement/account/index.vue @@ -365,7 +365,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/privilegeManagement/role/index.vue b/src/views/privilegeManagement/role/index.vue index e316ba9..7dcb481 100644 --- a/src/views/privilegeManagement/role/index.vue +++ b/src/views/privilegeManagement/role/index.vue @@ -189,7 +189,7 @@ height: 100%; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } @@ -203,7 +203,7 @@ border-right: 1px solid #d9d9d9; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/privilegeManagement/role/permissions.vue b/src/views/privilegeManagement/role/permissions.vue index 2f83ba6..fba71e1 100644 --- a/src/views/privilegeManagement/role/permissions.vue +++ b/src/views/privilegeManagement/role/permissions.vue @@ -395,7 +395,7 @@ border-right: 1px solid #d9d9d9; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/richText/index.vue b/src/views/richText/index.vue index 7060392..47c67f1 100644 --- a/src/views/richText/index.vue +++ b/src/views/richText/index.vue @@ -258,7 +258,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/shelfs/list/putawayShelf/centerBtns.vue b/src/views/shelfs/list/putawayShelf/centerBtns.vue index 7599751..4fbfb28 100644 --- a/src/views/shelfs/list/putawayShelf/centerBtns.vue +++ b/src/views/shelfs/list/putawayShelf/centerBtns.vue @@ -34,14 +34,14 @@ export default { leftStyle() { return { color: "#fff", - background: this.isClickLeft ? "#409EFF" : "#bfcbd9", + background: this.isClickLeft ? "#a90500" : "#bfcbd9", cursor: this.isClickLeft ? "pointer" : "not-allowed" }; }, rightStyle() { return { color: "#fff", - background: this.isClickRight ? "#409EFF" : "#bfcbd9", + background: this.isClickRight ? "#a90500" : "#bfcbd9", cursor: this.isClickRight ? "pointer" : "not-allowed" }; }, @@ -80,4 +80,3 @@ export default { } } - diff --git a/src/views/shelfs/list/table.vue b/src/views/shelfs/list/table.vue index 7a6d503..d124ade 100644 --- a/src/views/shelfs/list/table.vue +++ b/src/views/shelfs/list/table.vue @@ -14,7 +14,7 @@ @@ -31,13 +31,13 @@ 上架 删除 @@ -140,4 +140,3 @@ export default { } }; - diff --git a/src/views/shelfs/replenishment/quxia.vue b/src/views/shelfs/replenishment/quxia.vue index 7dc4624..afb5e1e 100644 --- a/src/views/shelfs/replenishment/quxia.vue +++ b/src/views/shelfs/replenishment/quxia.vue @@ -48,7 +48,7 @@ diff --git a/src/views/shelfs/status/table.vue b/src/views/shelfs/status/table.vue index dac1521..ebfc011 100644 --- a/src/views/shelfs/status/table.vue +++ b/src/views/shelfs/status/table.vue @@ -33,7 +33,7 @@ @@ -152,4 +152,3 @@ header { } } - diff --git a/src/views/valueAddedManagement/valueAddedAtatistics/index.vue b/src/views/valueAddedManagement/valueAddedAtatistics/index.vue index be86054..dc25255 100644 --- a/src/views/valueAddedManagement/valueAddedAtatistics/index.vue +++ b/src/views/valueAddedManagement/valueAddedAtatistics/index.vue @@ -88,7 +88,7 @@ @@ -278,7 +278,7 @@ } .active { - border-bottom: 2px solid #409EFF; + border-bottom: 2px solid #a90500; } } diff --git a/vue.config.js b/vue.config.js index 6927552..628093c 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,22 +1,26 @@ // vue.config.js -var path = require("path") +var path = require("path"); + +const BASE_API = "https://test.tall.wiki/datang/v1.0" +const proxyUrl = '/datang/v1.0' const port = 8080 module.exports = { - // devServer: { - // port, - // proxy: { - // change xxx-api/login => mock/login - // detail: https://cli.vuejs.org/config/#devserver-proxy - // ['/api']: { - // target: `http://localhost:${port}/mock`, - // changeOrigin: true, - // ['^' + "/api"]: '' - // pathRewrite: { - // } - // } - // }, + devServer: { + open: true, + overlay: { + warnings: false, + errors: true, + }, + proxy: { + [proxyUrl]: { + target: BASE_API, // 代理接口 + changeOrigin: true, + pathRewrite: { [`^${proxyUrl}`]: '' }, + }, + }, + }, // after(app) { // const baseConfig = require('./babel.config') // require('babel-register')({ @@ -38,16 +42,16 @@ module.exports = { // } // }, chainWebpack: config => { - //配置 alias + //配置 alias config.resolve.alias.set("~", path.resolve(__dirname, './public')) - //处理 前端资源的image 都转base64 file-loader + //处理 前端资源的image 都转base64 file-loader config.module .rule('images') .use('url-loader') .loader('url-loader') .tap(options => Object.assign(options, { limit: 10240 })) - // html plugin + // html plugin config.plugin('html') .tap(args => { args[0].minify = { @@ -56,4 +60,4 @@ module.exports = { return args }) } -} \ No newline at end of file +}