From 31da2a55a3cb2e1cf4910d590fb87bc86b6a7ee5 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Thu, 9 May 2024 15:43:02 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=90=84=E5=B7=A5=E5=8E=82=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 4 +- package.json | 1 + src/assets/images/companyData/energy.png | Bin 0 -> 511 bytes src/assets/images/companyData/order.png | Bin 0 -> 812 bytes src/assets/images/companyData/prod-minor.png | Bin 0 -> 226 bytes src/assets/images/companyData/store.png | Bin 0 -> 326 bytes src/main.js | 2 + .../copilot/components/FactoryDataHeader.vue | 131 +++++++ .../copilot/components/FactorySelect.vue | 137 +++++++ .../factoryData/assets/images/bipv.png | Bin 0 -> 2175 bytes .../factoryData/assets/images/chip.png | Bin 0 -> 2513 bytes .../copilot/factoryData/assets/images/fto.png | Bin 0 -> 1316 bytes .../copilot/factoryData/assets/images/std.png | Bin 0 -> 2189 bytes .../factoryData/components/Container.vue | 232 ++++++++++++ .../factoryData/components/ContainerIcon.vue | 56 +++ .../copilot/factoryData/components/Energy.vue | 357 ++++++++++++++++++ .../copilot/factoryData/components/Order.vue | 45 +++ .../factoryData/components/ProdMonitor.vue | 272 +++++++++++++ .../copilot/factoryData/components/Store.vue | 152 ++++++++ src/views/copilot/factoryData/index.vue | 173 +++++++++ yarn.lock | 52 +++ 21 files changed, 1612 insertions(+), 2 deletions(-) create mode 100644 src/assets/images/companyData/energy.png create mode 100644 src/assets/images/companyData/order.png create mode 100644 src/assets/images/companyData/prod-minor.png create mode 100644 src/assets/images/companyData/store.png create mode 100644 src/views/copilot/components/FactoryDataHeader.vue create mode 100644 src/views/copilot/components/FactorySelect.vue create mode 100644 src/views/copilot/factoryData/assets/images/bipv.png create mode 100644 src/views/copilot/factoryData/assets/images/chip.png create mode 100644 src/views/copilot/factoryData/assets/images/fto.png create mode 100644 src/views/copilot/factoryData/assets/images/std.png create mode 100644 src/views/copilot/factoryData/components/Container.vue create mode 100644 src/views/copilot/factoryData/components/ContainerIcon.vue create mode 100644 src/views/copilot/factoryData/components/Energy.vue create mode 100644 src/views/copilot/factoryData/components/Order.vue create mode 100644 src/views/copilot/factoryData/components/ProdMonitor.vue create mode 100644 src/views/copilot/factoryData/components/Store.vue create mode 100644 src/views/copilot/factoryData/index.vue diff --git a/.env.dev b/.env.dev index e8ccd63..f62007f 100644 --- a/.env.dev +++ b/.env.dev @@ -5,8 +5,8 @@ ENV = 'development' VUE_APP_TITLE = 芋道管理系统 # 芋道管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.1.61:48080' -# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com' +# VUE_APP_BASE_API = 'http://192.168.1.61:48080' +VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/package.json b/package.json index d920609..4809466 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ }, "dependencies": { "@babel/parser": "7.18.4", + "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "0.4.0", "axios": "^1.6.8", "clipboard": "2.0.8", diff --git a/src/assets/images/companyData/energy.png b/src/assets/images/companyData/energy.png new file mode 100644 index 0000000000000000000000000000000000000000..e89185c12eb79c3288660e05475161c71b3af604 GIT binary patch literal 511 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`EDi7paRt)< z2R+#F_i-rDp=KpPe!&ckOw2579K3u|@=7Y|8hZMM#wMm_=9X6W4j!HXLAeE0HLZJ3 zo<4j2!j-ExZa;YV=A_Z>OFVYck+*mDgBdp`_(!p?q$I z$G`uVV|Fm6T%7mDV&`tXBLCT2);B0{I6cic!^HdStkceoz8>8v>CafQy%smK1$xcC z!xp#Yl69d&zVhar%d!n`SDPN#&Uk0VWWgOJENcE&*^VSDsH|7mkn~l|ZjDgma^sf7 z&V-f95eiE*!#~_KW_8hBcR-YJd*>TNG5t#p?iciTp8C4F>hIDpC5QKGqUv9X&Ht<) x@StZ(!3S}THy+9DT0VJeHrtCi3bc5AU{wfsFtO-WcRtWZ44$rjF6*2UngApjEWZE% literal 0 HcmV?d00001 diff --git a/src/assets/images/companyData/order.png b/src/assets/images/companyData/order.png new file mode 100644 index 0000000000000000000000000000000000000000..a0429a913d592e84a4b2dcee7a804c5d6550a84b GIT binary patch literal 812 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(eb%Le#_xB>xoZWqV{eq(s z602(JTDyDuCQh0%b=KT@3l=Y3wqnD^tvmJ~K632T=`$CuT)Teb_MN-;?mu|==<$S~P*uu};++o7eVQk>e@beT0tC@>r0&DP#QwJXKEHM$#ygFG! zKSD{8!Rz+Mur`5&Ct~i?7**IGIYO#5 zYdVb-qB!&v7$40xKDeVP(M3|=xf0J)ZzrxD0^uA5-AY!*KdqY`K3q6^jybK{Y3x7$P}?$deOKSR3e0wY&Zg%5>CK&Y h@!biH1)K~FyZ-Th-B*6*Ixr#`JYD@<);T3K0RX8-=Z^pY literal 0 HcmV?d00001 diff --git a/src/assets/images/companyData/prod-minor.png b/src/assets/images/companyData/prod-minor.png new file mode 100644 index 0000000000000000000000000000000000000000..91220d97beea7e6f361ece83292159b9b1563d39 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%Cx&(BWL^R}5&=FTu0Z-f zHlSQLHy$X*UJ~RN%)l)n;~6@8)w1ebpiru(i(`n#@#F*v)(}>obqfmwdR*rj?v-Km z+NhDBt-iov?gXZCC$2;8q7#-dl;=!d#b6w}K=VM!=@m>$qBESB#J4k@^#i8k;uwa1?LpM{fOQXypgDA&9aR!DscIKs@qQ2GuEoAU?^>bP0l+XkKzR6E^ literal 0 HcmV?d00001 diff --git a/src/assets/images/companyData/store.png b/src/assets/images/companyData/store.png new file mode 100644 index 0000000000000000000000000000000000000000..d96dc6d8a4ab5bdaecb0e1cd05dd5c7bb20e942d GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Ll*#OmiefC>ve zT^vIq4!^y2lB>ah$Ms^^+RrxGU;o!%&Sja(!lJupGw&T&r-fdO2VOs#dh!m-q`8_- z42{bV925EX!*b>n#R`rqb3~_|V|n8fQMusziv#jU8sFHQJlg1XxiRmlwS;w2(Wf2` ng@yyu8?zEMKFnv`QNU2|F!lD?d+#R$Eobm_^>bP0l+XkKZ}ztB literal 0 HcmV?d00001 diff --git a/src/main.js b/src/main.js index a3b0f0b..1baa77b 100644 --- a/src/main.js +++ b/src/main.js @@ -18,6 +18,7 @@ import store from "./store"; import router from "./router"; import directive from "./directive"; // directive import plugins from "./plugins"; // plugins +import { scrollBoard } from '@jiaminghi/data-view' import "./assets/icons"; // icon import "./permission"; // permission control @@ -69,6 +70,7 @@ Vue.use(directive) Vue.use(plugins) Vue.use(VueMeta) Vue.use(CodeBrickZj); +Vue.use(scrollBoard) // Form Generator 组件需要使用到 tinymce import Tinymce from "@/components/tinymce/index.vue"; Vue.component("tinymce", Tinymce); diff --git a/src/views/copilot/components/FactoryDataHeader.vue b/src/views/copilot/components/FactoryDataHeader.vue new file mode 100644 index 0000000..cafa9bb --- /dev/null +++ b/src/views/copilot/components/FactoryDataHeader.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/src/views/copilot/components/FactorySelect.vue b/src/views/copilot/components/FactorySelect.vue new file mode 100644 index 0000000..b46fd14 --- /dev/null +++ b/src/views/copilot/components/FactorySelect.vue @@ -0,0 +1,137 @@ + + + diff --git a/src/views/copilot/factoryData/assets/images/bipv.png b/src/views/copilot/factoryData/assets/images/bipv.png new file mode 100644 index 0000000000000000000000000000000000000000..42ca5065321e7630428c5f9dfd3bbe1f84d2c189 GIT binary patch literal 2175 zcmV-_2!QvAP)Px-IY~r8R9Hu?nR{?lR~^T{=k9JcA&&;b5(tkh%~)zva1x586i24*s5n!{p%tfE z#_2fHQcHM5n~ojF)bTOX!7PuK)`DOTzz?!9~N?%ix2+{r)pJbu5={?6}pZV2Z1to5=*Or}pVLLMN1gAsBWK{+sSMNtzpcD%h<^n{Q(%t(sCF;_@Crulz#UgpR)dDwmQUpvjVNZnD`>4*awD{ zTo~bGU0)`ox9lAgH$&j@tQN32GM>;j|rt7hYmN|eMRgrsprZbA}-u|uHY z<`3%TkIe>nTA;VR6DYBk-}HS3>>-TV4UWT-m{SYVEgk@oo<7%MJBnsPX9AoTbXE7{ z*8%!0V_1?)u!TT}n!sZ0MtutIlBys=@8-z1X$<6l3O=47? z;^ULPKKNPgusz(LAXZwH>4#9W$x%{9CMTSMqD+>n=w7;T)F5R|M2i5(XQUqRa zLp(45$CtnQ-@@t@HyfI(9Q9BMhtYrZ`Kdt{9rrt}3Fg%VX8v9=jl>6h7<}_pz+&|* z+1~hDmPix?yE~hC!Kbk(Ci{9JPmE*Ut*bD9dmT{7)%85>-`w&c$F*fgvWI^Ha=d0m^~=cSW3%KR=-{;T6sI)EM*60c7CCe2nO0- z$OHO<-wCVi&6Uv80Rt6u_~fraY_|6+x9$joF)1GKZQy%pBEgj4STuI!qANb&Z(aQ8 zo_j!XSU(Z1CCsn~f2Gkd0>^)mACw_s9!!Qx!jK5~F>>kzNP)d;;X{wFO>R> zSJz_QQ_jkVw|QW(RHiMST9?r)&}amMuf3EH)a#@QnO1sA4Eizp$JbO)$Ck&|sx{Ei zkS38ve%H279=rbYgQOKHq@kMv zAP)^-{GE0XTR~UFS01YZV?>FCs`wrzC!kD>Aaec;l<{Fmh4V1~{zno3v1Q81ECT%K zM^7Hj1Nt+sQMb~D)T;^JT7Z&un_zP+)kPRiEF(?RSOjCI zj!g~vi638CMkRJFT|rDUsj83$#}MstbC3(gb@w&Vc(gEb?%iX_3q2vkX17{yT3{=v zsv*Q)m~r)+LT)sSi9f$QH7K@q+sc-ehQVOdV8!dYmR^kMODmmv4b>CCwAO1)XDa%Y zQ9r`&jy#|MN}Dge0me3GyLu8&Z-|W!oW9p<4RogSsqbk^@(&i-Wrbn#LMP(a{>7Jm zj5Ds~q8LNfEq}VFS|+3mV2&(Zxzj;bdNk$K26MppuAo_(Lq3Cbr5 zo6awn65&6fptx2{Ct`Za?9bEh>8nW|E`fnT_Fux}Wj8<-&6jq-?c!~e{+RbM>l>>r z3vTYRIoCLdJ#~dL?E!=nRX>dJBQ@(4GHskxOM?L<{^JG>4hh~y{t7vCAI`p%$Pda_ z+}*GoC^}}Xs=dd$WEDUxI)Zugm+!NVz>DGD;G+R7B*w~UAv3G zNRw2y_(^H$9Yv(DT=S*;U7=>MiGC=3U0|_sQTPCWr{Hn%6Eil69|C zamxcz@$uSK}d2UpLr9p9mNSAqOB?e}un3Yv^O=X3@;uckQ_smZJSq zy=2bMK;`VYB zS0(T7OaUgYf(@PnWJ63`0U^8LZaFybbLV4G8@qfG+{ypDVdJ+y3vs&%o_6d@7oa${Po&Y2Vmf zh{VW3#A5!;q&*wJ8+Y_`(LRH{H{PN%P(G8T{{ww^gjfq*!+`(*002ovPDHLkV1jTV B94i0- literal 0 HcmV?d00001 diff --git a/src/views/copilot/factoryData/assets/images/chip.png b/src/views/copilot/factoryData/assets/images/chip.png new file mode 100644 index 0000000000000000000000000000000000000000..64ada6ffe2dfe8f9edcd689417947a67aafd9ee6 GIT binary patch literal 2513 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 literal 0 HcmV?d00001 diff --git a/src/views/copilot/factoryData/assets/images/fto.png b/src/views/copilot/factoryData/assets/images/fto.png new file mode 100644 index 0000000000000000000000000000000000000000..c7e520c80054f7f2ec2ffeacd03e0319842702ec GIT binary patch literal 1316 zcmY+Ee>Bs37{@>R$$nt8ACZI`vZiDS^~c3s7o9afMx1VS`4o6~G4 zol{*_bgCPN8?J6qn5k`LZM3_{=69h{vHR5@_niAauh08=&gc0&&tK2^TnJ+YSzzt3 z004`SU`7NKsq4oa0r`i`eo0V(Wkdu8g62Vc0|4;EFlOX_=<=&ffO;PIpQm=2z`kri z=K=pz5G$jrOj}zP0QU*-IR!X!+$lLOSB@(hB|}t>l4~FgPB#rscMY_Mi?pYUG&zI` zgopsM+WGDb@J(}Uo&vtBFI08DH%r&7?bfVWaZ4@Ib>RO>bhbsMX7wnDXS?OWU0 zF}oU#UG3PW`teQm@9eKnY=*co;n1LWXfQZ58n!eTwlo?XnSHG?gH_ADebg2e_f7#feaup$tMBr@gy`o<-W%S}3+_n-3f3o0r^wT;i7 zsZ`_R6MFsh^z7WamR48wYU2>J$K()3K%{T~NL5E^WB{S4YqFDSph@1b>)np#3XMv zeY+%CA}gQZODF|_$fAZFDPz^hD&H{o627fD`eq3q9x;D6dgtPjCF&$x9M<)%(9NIy zu}9?EmTu_YuQKI&=ftlpIZLc0y+-QV{K|6Y9D#Bt=-5PPij&(w=;zDL%7XWCzn#zZ zENMM;mg*hd>qrgO>YwYRH-8{{NW`-a4vnr^GZBZB*Cj4DdId8v5Asrf;f%#(CIkDp z{8CP)Rofn*a*D&)gdZ)8%>f$%MGXl8eEFR?(PNj+8{&t&@ubPBz25v}!NwBZt?<^g zlD?Mwh9TdrV%;CC05ROA6;B)pAVm}3yIjj_i)AZIn}T%hbXrQ3`gT@b-mc2kwl!En zN=*l?iq)b#JA34*&M8ZKKxLTHGzr&f3JTJ0g+oo6)t0KPAt$_#M`F zUflC>x<~oCaNKId+80Z+n5$saIE|6D@@Em()#xnvY*9h4va1M7x9ix AdH?_b literal 0 HcmV?d00001 diff --git a/src/views/copilot/factoryData/assets/images/std.png b/src/views/copilot/factoryData/assets/images/std.png new file mode 100644 index 0000000000000000000000000000000000000000..c206420c12003242318f6bd1442e4ed3271bb1f3 GIT binary patch literal 2189 zcmV;82y*v{P)Px-M@d9MR9M69nR!%GS02Y-5<&tA0RmK%rAqO*qOA*yV6~&T^ysubMaQv9traYr zCV>*b4HvYfVy%iJ)mBs->~ldGi(3I1#eqs#6b!N`NR=HIv_x5cbKjCZ(BP=!AARS1 z4mrQ&{=V{c>DS@=$+1%ab?}1Q?tS3 zm5)QWqGthPixiDxi=Kj#F@MaBF(sX|UWvvrvW~yF$rQzI1s&j4prGmKo2%N4kts4p z%bt#SDFR1bQMiuISEP-~`yF%{t;49iCp6lAt(^RhXQT6f-!bY62w#XmmjbXHnfrJv z;_1lCkKu)r`?z()rN=AB7XbUYMGn9C`0vAW+M9-7Y=?f4L!+`iqR44C43#5CF<#I2 zxX(Tm4$pd&Ff8+tVp!%wcv-lfZUE~qk1Lo{qa(2Kf&J@Q*Ygi%jLdH06Tf->yQKrS z<@O9ccOQnHd+@?=&1eC;bs2yJ0_G_O6W_I9ws5B$n8)i$)7$1??h!*!!>K&~q#mc_3Q+phw9vHn%Aj3^!1*Yi6o^d<2SIQO z3_fy)s6pqpNipxpL70cc(OBc5(DcK2u>ZDz@*mZu2`pFO z^vxJ4)H$^gcTR19KIm{h(im^QqmUTCK`h_c2Aee(kl=dK?{u&ZEX5~)Fq#lLLF1;amPdVK%07fQtDfrQyN5=|1KL;U?Y3ZmM50tG+<3zLrs(^ z(O?yx4i3q6hVwOWLI{G7^iQb6{(HE?{<}buOtZfalJ8YHB-hW!JR%)Yp&v2th%SEM zVHlWHt;!#?pF+1?``r~__e~+##^r(ek{|mgbl|=^903%+(bVanZ@1rf_bW0#sWzwg zJQSB$1s1_Ln9SNp3L}OH(fb5wq8cyMKB*43-*X2D2Iyel2Uby;cTwT__DOdNbn{g) z(hHOzdIcb`i7Qa~`2ndnF)ztdql6Afti|8hRSVkG=%DWxh)$D*g&VJS8p`8+folmw zv|&C`o8I`Yszw=OyS;KPvRNCo@Z0UE!R@}g4aQ)r0YB_tqyX!6`FehV_zdY|&D;c- zS2#j)*m`5pD!c79&ARPaZzw=*rN@z463h6G+v>~=3bjqB#%&U+!8mTI;Dw}iIU~@nsNJ(x zn=5gv%@tsnN*aBi`SO#bAdARcu!^ft!F-QeSNW2Q&-8KvPd+8~edV}i_(Y<|eqOun zxSL?QU~e~C4YYgKa$`9z*l-gxvDCqk-z*@FEXE7JtctUc=Bp=Q6o}gvXI(&OqXS8`I$4f682oKs3ci0Z$%-PE;)0K8+L69SA1|-cdXwJTM<=KFjYAutQ|P4lM>#4NU$<31u(MRN06alSSl?)ovF2 zs}no4q@5k~E3iM$(#mCr7SR-|2`TI$^Zm~#hfgl%E}mfQD-{DJe9D*-dylm+9ZbF` zRKc7_9ei1z{-U-A(`rKrYjH*wHaVt?IeRBC zrmojq9p?7$#os&90u6^P4Bu}Q%*C0&S|$VL$JD`>`N?@;2FSXY^Nv2myrVSMQSnLD zP(nS7gx|-etSw^tUqtZ*6bsUUF>QfRK9jzD3!NcPGTz?z36$r3diP|E)#OE-Nl>^ZF`3W{r zJnDb{P(>D&l+ukSQDd4EiWX_fZp=Nzrq^8mtJATCm;AArJMUnV*C+*^M&ohv%lR%j zHP!^(c^EMyDDk3i(b8l5H+{_~(CeD{I$WOO>FBA + + + + + + diff --git a/src/views/copilot/factoryData/components/ContainerIcon.vue b/src/views/copilot/factoryData/components/ContainerIcon.vue new file mode 100644 index 0000000..6518242 --- /dev/null +++ b/src/views/copilot/factoryData/components/ContainerIcon.vue @@ -0,0 +1,56 @@ + + + + + + + diff --git a/src/views/copilot/factoryData/components/Energy.vue b/src/views/copilot/factoryData/components/Energy.vue new file mode 100644 index 0000000..298ace8 --- /dev/null +++ b/src/views/copilot/factoryData/components/Energy.vue @@ -0,0 +1,357 @@ + + + diff --git a/src/views/copilot/factoryData/components/Order.vue b/src/views/copilot/factoryData/components/Order.vue new file mode 100644 index 0000000..71302f7 --- /dev/null +++ b/src/views/copilot/factoryData/components/Order.vue @@ -0,0 +1,45 @@ + + diff --git a/src/views/copilot/factoryData/components/ProdMonitor.vue b/src/views/copilot/factoryData/components/ProdMonitor.vue new file mode 100644 index 0000000..432648b --- /dev/null +++ b/src/views/copilot/factoryData/components/ProdMonitor.vue @@ -0,0 +1,272 @@ + + + diff --git a/src/views/copilot/factoryData/components/Store.vue b/src/views/copilot/factoryData/components/Store.vue new file mode 100644 index 0000000..a7a4ad2 --- /dev/null +++ b/src/views/copilot/factoryData/components/Store.vue @@ -0,0 +1,152 @@ + + + diff --git a/src/views/copilot/factoryData/index.vue b/src/views/copilot/factoryData/index.vue new file mode 100644 index 0000000..6c00d34 --- /dev/null +++ b/src/views/copilot/factoryData/index.vue @@ -0,0 +1,173 @@ + + + diff --git a/yarn.lock b/yarn.lock index 7ed8aa8..989aea4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -972,6 +972,13 @@ dependencies: regenerator-runtime "^0.14.0" +"@babel/runtime@^7.5.5": + version "7.24.5" + resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.24.5.tgz#230946857c053a36ccc66e1dd03b17dd0c4ed02c" + integrity sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g== + dependencies: + regenerator-runtime "^0.14.0" + "@babel/template@^7.22.15", "@babel/template@^7.23.9", "@babel/template@^7.24.0": version "7.24.0" resolved "https://registry.npmmirror.com/@babel/template/-/template-7.24.0.tgz" @@ -1064,6 +1071,51 @@ wrap-ansi "^8.1.0" wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" +"@jiaminghi/bezier-curve@*": + version "0.0.9" + resolved "https://registry.npmmirror.com/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz#5196aca93c8b061a612b4c3eabcedf9490cef6ee" + integrity sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw== + dependencies: + "@babel/runtime" "^7.5.5" + +"@jiaminghi/c-render@^0.4.3": + version "0.4.3" + resolved "https://registry.npmmirror.com/@jiaminghi/c-render/-/c-render-0.4.3.tgz#982ebd8f71b443bb9507834227834973ebd9b6d8" + integrity sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q== + dependencies: + "@babel/runtime" "^7.5.5" + "@jiaminghi/bezier-curve" "*" + "@jiaminghi/color" "*" + "@jiaminghi/transition" "*" + +"@jiaminghi/charts@*": + version "0.2.18" + resolved "https://registry.npmmirror.com/@jiaminghi/charts/-/charts-0.2.18.tgz#63ded95200789fc1a1fd04b7fd9e56f58d22d90f" + integrity sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA== + dependencies: + "@babel/runtime" "^7.5.5" + "@jiaminghi/c-render" "^0.4.3" + +"@jiaminghi/color@*": + version "1.1.3" + resolved "https://registry.npmmirror.com/@jiaminghi/color/-/color-1.1.3.tgz#a2336750d1266155ffe80375c58c26fdec495611" + integrity sha512-ZY3hdorgODk4OSTbxyXBPxAxHPIVf9rPlKJyK1C1db46a50J0reFKpAvfZG8zMG3lvM60IR7Qawgcu4ZDO3+Hg== + +"@jiaminghi/data-view@^2.10.0": + version "2.10.0" + resolved "https://registry.npmmirror.com/@jiaminghi/data-view/-/data-view-2.10.0.tgz#2146d8fc71b9f24be808238ca050ddb7a4c8949f" + integrity sha512-Cud2MTiMcqc5k2KWabR/svuVQmXHANqURo+yj40370/LdI/gyUJ6LG203hWXEnT1nMCeiv/SLVmxv3PXLScCeA== + dependencies: + "@babel/runtime" "^7.5.5" + "@jiaminghi/charts" "*" + +"@jiaminghi/transition@*": + version "1.1.11" + resolved "https://registry.npmmirror.com/@jiaminghi/transition/-/transition-1.1.11.tgz#576d8af092434b34201eba5eaecc79dd33c8ad8c" + integrity sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg== + dependencies: + "@babel/runtime" "^7.5.5" + "@jridgewell/gen-mapping@^0.3.5": version "0.3.5" resolved "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz" From 3765db0611916281d96298427eec427c5c9176f4 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Thu, 9 May 2024 18:35:12 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=E8=88=B1=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../copilot/factoryData/components/Energy.vue | 88 +++++++++++-------- .../copilot/factoryData/components/Order.vue | 23 ++++- .../copilot/factoryData/components/Store.vue | 46 +++++++--- 3 files changed, 105 insertions(+), 52 deletions(-) diff --git a/src/views/copilot/factoryData/components/Energy.vue b/src/views/copilot/factoryData/components/Energy.vue index 298ace8..5339644 100644 --- a/src/views/copilot/factoryData/components/Energy.vue +++ b/src/views/copilot/factoryData/components/Energy.vue @@ -9,19 +9,14 @@ >{{ item.label }} -
+
diff --git a/src/views/copilot/components/LineChartWater.vue b/src/views/copilot/components/LineChartWater.vue new file mode 100644 index 0000000..9cb12bc --- /dev/null +++ b/src/views/copilot/components/LineChartWater.vue @@ -0,0 +1,481 @@ + + + + + + + + diff --git a/src/views/copilot/efficiency/components/StdRate.vue b/src/views/copilot/efficiency/components/StdRate.vue index 15fca00..f18af7d 100644 --- a/src/views/copilot/efficiency/components/StdRate.vue +++ b/src/views/copilot/efficiency/components/StdRate.vue @@ -1,7 +1,7 @@ @@ -28,21 +28,68 @@ export default { default: "日", }, }, + computed: { + cities() { + console.log('ztl', this.$store.getters.copilot.efficiency.stdRate) + // let getterName = ""; + // switch (this.dataSource) { + // case "标准组件产出": + // getterName = "stdOutput"; + // break; + // case "芯片产出": + // getterName = "chipOutput"; + // break; + // case "BIPV产出": + // getterName = "bipvOutput"; + // break; + // } + const _cities = [ + { name: "瑞昌", target: 0, total: 0, current: 0, componentYield: 0, goodNumber:0,}, + { name: "邯郸", target: 0, total: 0, current: 0, componentYield: 0, goodNumber: 0, }, + { name: "株洲", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, }, + { name: "佳木斯", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, }, + { name: "成都", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, }, + { name: "凯盛光伏", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, }, + { name: "蚌埠", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, }, + ] + if (this.$store.getters.copilot?.efficiency.stdRate?.previous) { + this.$store.getters.copilot?.efficiency.stdRate?.previous.forEach( + (v, idx) => { + _cities[idx].previous = v ?? 0; + } + ); + } + if (this.$store.getters.copilot?.efficiency.stdRate?.target) { + this.$store.getters.copilot?.efficiency.stdRate?.target.forEach( + (v, idx) => { + _cities[idx].target = v ?? 0; + } + ) + } + if (this.$store.getters.copilot?.efficiency.stdRate?.current) { + this.$store.getters.copilot?.efficiency.stdRate?.current.forEach( + (v, idx) => { + _cities[idx].current = v ?? 0; + } + ); + } + // 删掉凯盛光伏 + // _cities.splice(4, 1); + return _cities; + }, + }, data() { return { - cities: [ - { name: "瑞昌", target: 100, total: 200, thisYear: 20 }, - { name: "邯郸", target: 200, total: 300, thisYear: 20 }, - { name: "株洲", target: 300, total: 400, thisYear: 20 }, - { name: "佳木斯", target: 400, total: 500, thisYear: 20 }, - { name: "成都", target: 500, total: 600, thisYear: 20 }, - { name: "凯盛光伏", target: 400, total: 500, thisYear: 20 }, - { name: "蚌埠", target: 500, total: 600, thisYear: 20 }, - ], + // cities: [ + // { name: "瑞昌", target: 100, total: 200, current: 20 }, + // { name: "邯郸", target: 200, total: 300, current: 20 }, + // { name: "株洲", target: 300, total: 400, current: 20 }, + // { name: "佳木斯", target: 400, total: 500, current: 20 }, + // { name: "成都", target: 500, total: 600, current: 20 }, + // { name: "凯盛光伏", target: 400, total: 500, current: 20 }, + // { name: "蚌埠", target: 500, total: 600, current: 20 }, + // ], }; - }, - computed: { - }, methods: {}, }; diff --git a/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue index e9d2133..80dcd2f 100644 --- a/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue +++ b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue @@ -59,7 +59,7 @@ export default { }, valueTuple() { const getter = this.chipRate; - console.log(getter) + // console.log(getter) if (this.period === "日" || this.period === "周") { return [ getter.previous[this.factoryId], @@ -111,11 +111,11 @@ export default { this.period == "月" ? `${year - 1}年${month}月良率` : `${year - 1}年良率`, - value: (this.valueTuple[0] * 100).toFixed(0) + "%", + value: isNaN((this.valueTuple[0] * 100).toFixed(0)) ? 0 + "%" : (this.valueTuple[0] * 100).toFixed(0) + "%" }, { label: this.period == "月" ? `${month}月良率` : `${year}年良率`, - value: (this.valueTuple[1] * 100).toFixed(0) + "%", + value: isNaN((this.valueTuple[1] * 100).toFixed(0)) ? 0 + "%" : (this.valueTuple[1] * 100).toFixed(0) + "%" }, ]; }, diff --git a/src/views/copilot/efficiency/components/sub/std/ProgressBar.vue b/src/views/copilot/efficiency/components/sub/std/ProgressBar.vue index f7df2a0..6586f16 100644 --- a/src/views/copilot/efficiency/components/sub/std/ProgressBar.vue +++ b/src/views/copilot/efficiency/components/sub/std/ProgressBar.vue @@ -6,11 +6,8 @@ --> @@ -23,23 +20,52 @@ export default { type: Number, default: 0, }, - total: { + target: { type: Number, default: 0, }, + goodNumber: { + type: Number, + default:0 + }, + componentYield: { + type: Number, + default:0 + }, + period: { + type: String, + default:'日', + }, title: { type: String, default: "", }, + city: { + type: String, + default:"" + } }, data() { - return {}; + return { + number: 0, + titleYear:'', + }; }, computed: { dataRate() { - return this.total == 0 + if ((this.period === '年' || this.period === '月') && this.target != 0) { + // console.log(this.componentYield) + this.titleYear = this.title + ' ' + `${(this.target * 100).toFixed(0)}%` + } else { + this.titleYear = this.title + } + this.number = this.value == 0 ? "-" - : `${(parseFloat(this.value / this.total) * 100).toFixed(0)}%`; + : `${(this.value * 100).toFixed(0)}%` + // console.log(this.period) + return this.value == 0 + ? "-" + : this.value >1 ? 100 + '%' :`${(this.value * 100).toFixed(0)}%` }, }, methods: {}, @@ -69,7 +95,7 @@ export default { color: #fff; position: absolute; bottom: -200%; - right: 0; + right: 10px; font-size: 12px; } diff --git a/src/views/copilot/efficiency/components/sub/std/StdRateItem.vue b/src/views/copilot/efficiency/components/sub/std/StdRateItem.vue index ae1dbba..1ea1543 100644 --- a/src/views/copilot/efficiency/components/sub/std/StdRateItem.vue +++ b/src/views/copilot/efficiency/components/sub/std/StdRateItem.vue @@ -1,7 +1,7 @@ @@ -10,29 +10,29 @@
- +
- +
- - + +
- - + +
diff --git a/src/views/copilot/energy/components/ElecCost.vue b/src/views/copilot/energy/components/ElecCost.vue index b6c7a17..2a3e3aa 100644 --- a/src/views/copilot/energy/components/ElecCost.vue +++ b/src/views/copilot/energy/components/ElecCost.vue @@ -1,4 +1,4 @@ - diff --git a/src/views/copilot/components/LineChartWater.vue b/src/views/copilot/components/LineChartWater.vue index 9cb12bc..4b435a7 100644 --- a/src/views/copilot/components/LineChartWater.vue +++ b/src/views/copilot/components/LineChartWater.vue @@ -1,4 +1,3 @@ - + + + + + + diff --git a/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue b/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue index 6ab1cc7..cd9a263 100644 --- a/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue +++ b/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue @@ -1,40 +1,32 @@ diff --git a/src/views/copilot/energy/components/NatGas.vue b/src/views/copilot/energy/components/NatGas.vue index b1712db..adb1bef 100644 --- a/src/views/copilot/energy/components/NatGas.vue +++ b/src/views/copilot/energy/components/NatGas.vue @@ -15,7 +15,7 @@ - + diff --git a/src/views/copilot/efficiency/components/StdRate.vue b/src/views/copilot/efficiency/components/StdRate.vue index f18af7d..71ded8c 100644 --- a/src/views/copilot/efficiency/components/StdRate.vue +++ b/src/views/copilot/efficiency/components/StdRate.vue @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@
-
+
@@ -97,13 +97,18 @@ export default { diff --git a/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue index c9d1216..56fb3be 100644 --- a/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue +++ b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue @@ -159,9 +159,9 @@ export default { } .chart { - width: 390px; + // width: 390px; align-self: stretch; - height: 280px; + height: 150px; } .legend { diff --git a/src/views/copilot/efficiency/components/sub/std/StdRateItem.vue b/src/views/copilot/efficiency/components/sub/std/StdRateItem.vue index 1ea1543..ba690b2 100644 --- a/src/views/copilot/efficiency/components/sub/std/StdRateItem.vue +++ b/src/views/copilot/efficiency/components/sub/std/StdRateItem.vue @@ -1,7 +1,7 @@ @@ -117,7 +117,7 @@ export default { margin: 6px; display: flex; gap: 12px; - height: 60px; + height: auto; flex-direction: column; justify-content: center; } diff --git a/src/views/copilot/efficiency/index.vue b/src/views/copilot/efficiency/index.vue index 3c49edd..3fbb463 100644 --- a/src/views/copilot/efficiency/index.vue +++ b/src/views/copilot/efficiency/index.vue @@ -1,7 +1,7 @@ diff --git a/src/views/copilot/energy/components/ElecCost.vue b/src/views/copilot/energy/components/ElecCost.vue index 7a12fa6..59697c1 100644 --- a/src/views/copilot/energy/components/ElecCost.vue +++ b/src/views/copilot/energy/components/ElecCost.vue @@ -85,48 +85,25 @@ export default { // } // }, series() { - const { ftoInvest } = this.$store.getters.copilot.yield; - let dataList = null; + return this.$store.getters.copilot.energy.elecList; + // let dataList = null; - switch (this.period) { - case "日": - case "周": - dataList = ftoInvest?.current; - break; - default: - dataList = []; - dataList[0] = ftoInvest?.pervious; - dataList[1] = ftoInvest?.current; - } + // switch (this.period) { + // case "日": + // case "周": + // dataList = ftoInvest?.current; + // break; + // default: + // dataList = []; + // dataList[0] = ftoInvest?.pervious; + // dataList[1] = ftoInvest?.current; + // } - return getTemplate(this.period, dataList); + // return getTemplate(this.period, dataList); }, }, methods: {}, }; - -function getTemplate(period, dataList) { - const year = new Date().getFullYear(); - const month = new Date().getMonth() + 1; - return period == "日" || period == "周" - ? [ - { - name: period == "日" ? "昨日" : "本周", - data: dataList ?? [], - }, - ] - : [ - { - name: period == "年" ? `${year - 1}年` : `${year - 1}年${month}月`, - data: dataList ? dataList[0] : [], - }, - { - name: period == "年" ? `${year}年` : `${year}年${month}月`, - data: dataList ? dataList[1] : [], - // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)), - }, - ]; -} diff --git a/src/views/copilot/energy/options/monitorOptions.js b/src/views/copilot/energy/options/monitorOptions.js index b6b6c91..51dc2b8 100644 --- a/src/views/copilot/energy/options/monitorOptions.js +++ b/src/views/copilot/energy/options/monitorOptions.js @@ -1,19 +1,16 @@ /* * @Author: zhp * @Date: 2024-05-07 10:25:10 - * @LastEditTime: 2024-05-10 16:10:49 + * @LastEditTime: 2024-05-16 13:35:50 * @LastEditors: zhp * @Description: */ export default function ({ - single = false, + // single = false, colors = ['#2760FF', '#5996F7', '#8BC566', '#11FAF0','#F3C000'], titleValue, subtitle, dataList, - previousSum, - currentSum, - targetSum, }) { return { grid: { @@ -26,7 +23,7 @@ export default function ({ // tooltip: {}, title: { text: titleValue, - left: "49%", + left: "47%", top: "39%", textAlign: "center", textStyle: { @@ -50,7 +47,7 @@ export default function ({ { name: 'Access From', type: 'pie', - // center: ['50%', '40%'], + center: ['50%', '50%'], radius: ['50%', '80%'], avoidLabelOverlap: false, labelLine: { @@ -62,7 +59,6 @@ export default function ({ data: dataList && dataList.length > 0 && dataList.map((item, index) => ({ name:item.name, value: item.value, - itemStyle:{ color:{ type: 'linear', diff --git a/src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue b/src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue index 6f15a90..90bcdc7 100644 --- a/src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue +++ b/src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue @@ -8,7 +8,7 @@