From 211caa844c0e836b727626b02fc63e658563303d Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Mon, 8 May 2023 14:35:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=AE=BE=E5=A4=87=E8=81=94?= =?UTF-8?q?=E8=B0=833?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/companyFile/defaultimage.png | Bin 0 -> 7177 bytes .../components/companyDataDialog.vue | 60 ++++++-- .../systemManagement/companyList/index.vue | 130 +++++++++++++----- .../components/addVideoDialog.vue | 95 ++++++------- 4 files changed, 190 insertions(+), 95 deletions(-) create mode 100644 src/assets/companyFile/defaultimage.png diff --git a/src/assets/companyFile/defaultimage.png b/src/assets/companyFile/defaultimage.png new file mode 100644 index 0000000000000000000000000000000000000000..63091eed08aeb88c97da0fafb4d72a7cf5663a27 GIT binary patch literal 7177 zcmb_>c{r5e_xFf~WLFYdvX|^@B-zOpijXx+Dn_IcGi57;NHvsDlp++B!SH0uk}cUA z;~D!tOJfW(;rICdzW=;`yw~;q@m|+G*K?oGea?N(`JD4S&pk7#7aXj3xy86)Fc`0m zwYf74wr>*pAUW6}#HrNwJakdNV0Y1CcXwA&LHGZC@F?V6f^7M3J3F|*1kHm|%5ca_ zG9^UA;^V8G(pC7cGGL_SF_I)By_n-wX zvawIM*jkG{i9f`W#CE9a+~2fwN}y<@ zD5K$-O9a+EfIfM5p#X_+>Z$rm`@VDi-oHtY__@>5l8qA^*VZ>|Iint<;zqns4;x%| zneuLV#%E_mIN!FhNS2Eu#$>$5l`Rphu9DPr6nHjepo*sE;emSKDW1zsW^H@MiopS#`j;tQmEz@wDnrA{%@ukCtM+lkrCrXgUq#{7u5EV?=kb5o}v|EXMOV z*Uq>7o=4m4Iu|)sFVuL(SVhJ(Ytw;7ySGr^7+ja{r!-YCxYHozjUAo4^YGlw>DU5X z@kUsTvrS$ zXnI%8h$EGpM2=|}H1cp`hjA*qE8_`4RC zgYigTH81B0A+T|spt@1}gYCFAD)M6dtk^vlIe;O`?4{-v#Yt21&xjt&D#})dhc+OX z{VGP*y6)!>noJv_)%9N!bvduHlk?tpo^S*?QV}JbZUq3ATL0p&s5`U78ikCmFL;MY zXw$P*zr3)NCqvy9a{(jQ?Xx!L55QN>pmUQK2NU z@^o`&5__P1Fyb@QDjM8vLkqg!q6sW{MkP-Pkto|!VvPN>?ZFy=Bl#B6*ceEs*sG^i z-yYN2?+PAL>+9~o`GStr47KBW&46Alu0YZ2H93;>IQS>+92jF5f9v34Y#wf=u9}^O z&cuOrzuC6V&XDfZpy0DC4PZ)s?x{4$tWAnIILktl!h*X`b~1F4Sla&C*hJju)^9h^ zX50z1aRNjBzmKId^4kyOuX_W*ABI{m_TJvE-`V--bH6U*%yZ_QDrUwfdv6xw{tQ>7 zE)k8q_EdVXTB)cYx?myv_KZ>_)&xPcj{Nh_q+t{WwF7%6;z z={>IUzCcV6ozSGk2|%2~3p~*MUt$(N;wt+yTly-1g>m|**XVtTJ7ILAj`wD_lP6n- z8K?C4T2O@&4_hT3UkzR}3!1Bz?+agQS{i0(XRS39ly4RKpdD$ZwWQY)W5bL? z$KNn=FW;D8iS5Kw&<4T8+N;pxFe+Vg!`L0?=4_-JO$4Abr>rpheZ^MLku5xq;o42rt z%2~$uDlVcRXL=pC0WU=EGEVvhzOLocNC|MT8oR|-39~@^oO_Qu>jFA-Rx7e^3}e%R zmC%sg{(*qjtn+BxH76$I1$X)V`Wjc$u-;$8Z1-b2g3Ed9Q626>C4h|&atOcZ^;E3^Pnw3icgk2)YW7 zKZsv8EG661^M|lrkD01xOMs_E)YnW`aPrySLJhOVY+VJ*+(?QB{Cv=O_c!!VgdO_G z54Lw<`Gv@8vn71h$pWV8BguD&3dSw}J1`>K*NQo6qr;NticWrm!x9TkUrV4wx{cmW zWU6wx8B@cHfmEMGJe1vwL^xfmkXVu59ijt#ed$C?<DM;Fkod4k|q4I_&LrpypdBmAP!TkI8Wy-;v8Jlcv1r7!2sH`WpQiH zB0P&!0R+beBE8{7NCE3y8)a15LG#8~QU&q{J? zgJ3_j`meKuRe}Cx^N#6#`qj0};J70{Y=ib2a}+q2kxT7Ua^cZV|89ffYFjev>CR|I ziP)?d@yAa!sXm{bt?nB{VQ#vSR&R@LlbSa=DC6qQG`bO9rH1V+(fIz2g)*u8Eb{kr zv3{DU{!4!~_$aonq=~J*ZX}85C^yJB7-?V47j7EBoP2R3J2uYc_-~}kaBl)n_!Gd8 zH&nF~ma`c9t!m(hC{YOgePnFWpC>#XaAWpXsJ6k5EaKPSkWKdxTuIOozqoE%Xypa3 zBsSH4?7MSOZ17rruqKdQ#5XRDwrv`Ee3wnN57|F&2wi)zGl}o+6E_}Myd)dp5Z^7l zIAnXUkzKIibR-UX;%rKoWp$OulfM5~z3P zcJSFIi>(b-jh^d@P1Y=4dqCZ+X&Lr6YnCeqI|d3H-51;@IlbRZ;%I zxGrH?$$sS#`PVmWqy*6v6xA&%q^J8r}YM z(|5zWlUA&Qi{e$q%ZD?&3}`*gL#f+(?mZn0jY&Osk2_)f@w;C7Ae+w1pp@U$w7l## z>wXH8uXI4$C3}6Yzi3-=ZgUbk8nIcpiD65Xk96yWGyb?M-DC9P)z5mJ0-^WEp^$Mk zE0*I=DsSO6=~4gl&e@7%r_sqH*IwQg9)F78zP4*~8W<>jsxkI;bs;^tq|aEBX=$&W zb-k)#&RKEnD4Hz9Y!9ibXtp}jw1oo8PK;a9e`F^qN)l1P6JcI0;_vDj>rxLM@UvL& zWsg(4s6X|=x?q!7ueHZbJ?!=4C`Jle)^J#(Fjt$uZ!XWb$Pa!+vwx&8f(@02-=8@6 zJC$B|Xe#eilxfKi%*VEEMfuH=7uRy9B+G1#XsI?rtK|UFf3sblc4}#VOZnkU#LuAv zFEHNayK>*j4u?Q%6^!1#dbYl4!`m8MJ`N0x#_G9buoey06PoUoo%h>v+aN_-p(`8p{u%CNxq6gnY4RygQtq>DPu{RtzS0=yH zU={<`beZl8_b{m1d5Qvx-#WAttA_^$tC!G>X{Ja4#-5b-!BPu@8Dl?FhvH_*Wq0hPG@->Pw9MisAL;Bs<$4wt^vK!+(@>qYM>6K>W^BGcP42Wc-K=lO#`5 z(N)2pUo>1cXD`LfT;A<^3yccy6)YniSGVbqW$@y)X~+`7bFhz8rQUvHX% zo;GON!D`%-ou^AEtHNuqhlEsaJnus)R*|D=e7Wm(nqbv+?OvjYTB>%_)2+v@#YZh{ z{m>KA@aU6Zm$Ra_$D_;cA1?w=?X-IY5R+^L1vYcIZlbumyi{PE;@^DDDAPBAacc*6 zg{J@)d+i=+HI=+}M+0qFM z>*)H2)X8 zRvY@EKs%`SVaiuGZU)2O1{bmBbFbx=v~7ls_wiWwn=|q&EeFjH_v-n^SuqH6BVOO* zsiFN}9~g`Kv*w{Tokpi4I{Lq4&$Dvzx)Jnq$z&p%wy(U=ZLS9U( zsuDv0!2Wv~t<}b zWVb}J4GwUnSLG15UZ>3BT0>*F=3|?}F1r+jjOzn+H?*zJai9FerTU60PP~PB@58h2 z&FdG9zuN!FY%2i|?6jMJP0@WR!Hr?wPAIF1&&nKj>Rg)-V%`N7Z;~SNHdadZ|56(Y zj_aVPyta&l&9}lYM9>7ElCS=6BC)SUltsWRX(l~!?&A9{ADO47JtBHqFLQhuHRT*D ziH)Od&hO>d@GcM`PG5v0kA{aS5MsDT%MZgQ08w*WuK(PD8-e2W1 zT>l;7c&V`6Ve{m-oR|e2ND}6izoIvsqJfP6%@DyZ*+vV2(5ZDD+Tl&YO36nTP3SNJ zN`wvO_@4J)3QK8E+LupW7r&#^BEiF_5md2=>i#g$_N>i$Qo!Cs=mp}q&dYzzM1et= zA`MFB3-73Xo~>?Abk-JB55U}1UB4~sThU(?xu|NVxHsM>tG1d6nvzoUp6%xBZimf< zd)Z%g?xii9L_Ql8tSigJJTdV5m~ibawPQq6QgRm8Q2|kDb2A4pyrd0kiX{4$LyIAC z*mSGp&B+;8^Z^CYE13gtG_&_Id*}HvRp0HGI?SUzksb9VY%GdbK{Wkhpn>r|kM^tV zD2BU{Pt}1@3FR%V@9WXs(dFL}M|EE2`l`DUdj1JF1fCfI8LIE+Z>Y;xHD1ntY3o*# zo*cu%REcsx+Z^fZqn8Dq8Ny@JhYpm;)d+v`{PM|HW#$R6SK(*j1dZT*!G$OP0|Y{~ zJMUk-b1wLIwaQF90L0ood=HgxM#QO~hk~J=a|AUN#2`0MBJ=QHflT**eF>!rV~_CP zmPRKrRDEMmNO!g6d7I^Z&yPyz?%Zox&ie;ChhT`K{4`qQbMG*A`76kTg?=xCz1Ew% zXrhlB)s&o@!#$k{6~6RgR>Q`bA#D5|LzR}=QwV(4=8-E(RGBe33k05m$8*64|zAVwgd-MkfUM~_R2I_B2Dj-hhBM;uKv@hy`Uy0zT3lMBqBZ48A8^F&PW z<9+w?){w9AvAMO;0>uV!%bUPtv7Mq?oEL@FV0iHbkB*HzHoFPyuAZ>WP_ z1tf>W6RAc)%d}W&@cYjpe8|b#u$r71nxpt`0JZVQ5Pqpr_MslgnZ6tR&sH#8gs;ub zghOTmyO@2Ms|9_vOgd&FA7NTc7OM2L^lCm;jb3=RxnWjA=C1T?x9d7qguZ&--(vRO zyx>~wKti)e4Z_Z*JiYqGT{)I_t?y^d8jg2VWhSi{&cX6-@ck^Z7Rz4g+4(Srx09al zb~s5b0$tb?)xG(zL9hyl{Fp#7FNZc*zUK`P!@=`i+uJFd2vB78JzE9B1M; zeJF;{{e-(xNn2s9QNaQ{BarHK$kZLsBi2W9!Eg8h8kYoOC-NC)&&a~Hq*D-s7zFfu zYq7|3vi_T)lzP~EzlLQN1SO@foi-Afg;L+BH6*7=gYs9fWBt4HSu+rH2ZAz=?XjUb z!bUeuN7$+7nn5IpLMe=yk@{G&KlBttdt|6arjPdc6+terXH7$N^vOa{${qw!Y$h-b z(a|RdK@ayJ4dg;%)>Q1kN9pzyO5>P(l}idG<3mEH0;G^c79tsbgbF+r3;k{?E4Num ztfz6qZwUUE+GLp~#$S%aZyb9OTq%=or?9+>Aax>+m!T3R7;tbE$T=ZezJGHvZl&)% zw?7Y-Joh0%v~`WeQRzvN=@iLDtJy$I1?}0hham-`(Q3Ak>}bMVJ_T=()Hmj|rE_qt(aVmdCIY5A;eK4(+1c@ZM%Z|MGvqyeZubX(gPT$Z5x z1eRivr9#%%d=4_~GadF8|E=-&+CvOCOy)#kW@HHDtr7|7q1 zyD4*JP^8~f9S$(^gQsIVPYf=I+Pdz))!RBfb85{sobW;cNIo-v_mXE>_Lxn<-v&eJ zgyt*4pxLDFfgq^OPID&aFa}!JD`XN(nmtWe;cc3NV-HzI8B>*)ThPH@xT@nh zc}C+8z+)#`vTkNp$_6_43s)L;^zSOv)#typI|1E%w;R)2YwxKMUa>>e6V9+tiCg%|8m;Xn5Gk!IeOIXDGyp;qtLfuZW6=>r2^d=NFZ65itD^F)8>c=6VyqQQIt6aVF)sq{FCli146?r>;=Fg6{b8ELKPrTYfa-M5>q4j#T)?i&m=M#c!a$t>kZ8T)rLPcRSGFYD6G( zfoZC1=&GpesA%Y4)YLFg*E7)2S60_IP*+#*Zvg%egHS|3NYLH?yMdcA$3DnFYR^M> zq=9vab6}(?A}TB(BrMnz5e?JR(vH^E(oj}cR=0a$)C;K|`>(29;GMvmFp~g;f1rw% ds=Bnr1sBV`33pyNZU)kW*;qK3SDN}J{0~rwgj@gs literal 0 HcmV?d00001 diff --git a/src/views/systemManagement/companyList/components/companyDataDialog.vue b/src/views/systemManagement/companyList/components/companyDataDialog.vue index 7bfcfe7..2367b0e 100644 --- a/src/views/systemManagement/companyList/components/companyDataDialog.vue +++ b/src/views/systemManagement/companyList/components/companyDataDialog.vue @@ -46,13 +46,20 @@ - +
点击上传企业封面图片
@@ -183,15 +190,15 @@ + + + - - - @@ -238,6 +245,7 @@ import { postCompanyList, putCompanyList, } from "@/api/systemManagement"; +import defaultImage from "@/assets/companyFile/defaultimage.png"; export default { name: "CompanyDataDialog", data() { @@ -283,6 +291,10 @@ export default { belongingArea: "", }, imageUrl: "", + upUrl:`http://172.18.113.50:8080/zhapi/safety/system/enterpriseList`, // 图片上传地址 + upheaders: { + Authorization: localStorage.getItem('AuthorizationToken') + } }; }, created() { @@ -300,6 +312,7 @@ export default { } else if (num === 3) { this.dialogTitle = "编辑"; console.log("item", item); + this.imageUrl = item.picUrl; this.form = Object.assign(this.form, item); } }, @@ -397,9 +410,19 @@ export default { } this.$emit("back"); }, + handleAvatarSuccess(res, file) { + console.log('resimg',res); + console.log('fileimg',file); + // this.imageUrl = URL.createObjectURL(file.raw); + this.$message.success('上传成功') + }, closeForm() { this.visible = false; - } + }, + setDefaultImage(e) { + // 加载失败默认图片 + e.target.src = defaultImage; + }, }, }; @@ -463,7 +486,7 @@ export default { /* 表单内容浮动布局，多行多列表单 */ width: 900px !important; display: flex; - justify-content: space-between; + justify-content: flex-start; flex-wrap: wrap; .el-form-item { /* 表单域名跟input浮动布局 */ @@ -502,6 +525,10 @@ export default { display: flex; .avatar-uploader { margin-left: 8%; + img { + width: 220px; + height: 220px; + } } .avatar-uploader .el-upload { border: 1px dashed #d9d9d9; @@ -534,7 +561,7 @@ export default { display: block; } .el-form.commerceMessage_form { - /* 表单内容浮动布局，多行多列表单 */ + /* 表单内容flex布局，多行多列表单 */ width: 600px !important; } } @@ -586,18 +613,25 @@ export default { } .el-form.company_position_form { .el-form-item { - width: 30%; + width: 31%; + margin-left: 15px; + .el-form-item__content { + .el-input__inner { + width: 170px; + } + } } } .el-form.jurisdiction_form { + margin-left: 15px; .el-form-item { - width: 30%; + width: 33%; .el-form-item__label { - width: 70%; + width: 50%; } .el-form-item__content { .el-input__inner { - width: 150px; + width: 170px; } } } diff --git a/src/views/systemManagement/companyList/index.vue b/src/views/systemManagement/companyList/index.vue index e2ff6a5..caa149d 100644 --- a/src/views/systemManagement/companyList/index.vue +++ b/src/views/systemManagement/companyList/index.vue @@ -13,7 +13,6 @@
- 关键词:
  • - + {{ item.companyName }}
    {{ val }}
    - {{ item.companyAddress }} + + {{ item.companyAddress }}
    - + @@ -86,6 +91,7 @@ import CompanyDataDialog from "./components/companyDataDialog"; import ClearDialog from "./components/clearDialog"; import { getCompanyList } from "@/api/systemManagement"; import { debounce } from "@/utils/publicMethod_lxy/debounce.js"; +import defaultImage from "@/assets/companyFile/defaultimage.png"; export default { name: "companyList", components: { @@ -160,8 +166,12 @@ export default { this.getData(); }, jump() { - this.$router.push('/home/archives') - } + this.$router.push("/home/archives"); + }, + setDefaultImage(e) { + // 加载失败默认图片 + e.target.src = defaultImage; + }, }, }; @@ -197,18 +207,13 @@ export default { display: flex; justify-content: space-between; .top_search { + margin-left: 2vw; display: flex; width: 40%; height: 40px; - span { - width: 15%; - line-height: 40px; - text-align: center; - color: #fff; - } .top_search_input ::v-deep { /* 查询框 */ - width: 75%; + width: 60%; .el-input__inner { border-radius: 4px 0px 0px 4px; background: #3c4b4a; @@ -268,22 +273,18 @@ export default { flex-wrap: wrap; padding-left: 0px; li { - display: flex; - justify-content: center; - align-items: center; margin-left: 2.5%; position: relative; list-style: none; - width: 30%; - height: 47%; + width: 25.6vw; + height: 31vh; background: #1b3736; border: 1px solid #fff; - box-sizing: border-box; img { - margin-left: 0.5%; - margin-top: 0.6%; - width: 99%; - height: 98%; + margin-left: 0.3vw; + margin-top: 0.5vh; + width: 25vw; + height: 30vh; } /* 公司图片相关信息区域 */ .company_name { @@ -301,15 +302,63 @@ export default { z-index: 2; left: 10px; bottom: 35px; - .company_label_data { - text-align: center; - line-height: 30px; - padding: 0px 5px 0px 5px; - height: 30px; - color: #34e1b3; - background: url("~@/assets/companyFile/btn04.png") no-repeat !important; - background-size: 100% 100% !important; - margin-right: 5px; + .shewei { + height: 26px; + line-height: 26px; + width: auto; + background: url("~@/assets/companyFile/编组 11991.png") no-repeat; + padding: 0 5px; + font-size: 14px; + color: #b5ebff; + letter-spacing: 0.44px; + font-weight: 400; + background-size: 100% 100%; + margin-right: 10px; + } + + .zhongdian { + height: 26px; + line-height: 26px; + width: auto; + background: url("~@/assets/companyFile/编组 11222221.png") + no-repeat; + padding: 0 5px; + font-size: 14px; + color: #e3deff; + letter-spacing: 0.44px; + font-weight: 400; + background-size: 100% 100%; + margin-right: 10px; + } + + .zhibao { + height: 26px; + line-height: 26px; + width: auto; + background: url("~@/assets/companyFile/编组 11991备份 10.png") + no-repeat; + padding: 0 5px; + font-size: 14px; + color: #e3deff; + letter-spacing: 0.44px; + font-weight: 400; + background-size: 100% 100%; + margin-right: 10px; + } + + .zhian { + height: 26px; + line-height: 26px; + width: auto; + background: url("~@/assets/companyFile/编组 11991备份 21.png") + no-repeat; + padding: 0 5px; + font-size: 14px; + color: #e3deff; + letter-spacing: 0.44px; + font-weight: 400; + background-size: 100% 100%; + margin-right: 10px; } } .company_unit { @@ -377,7 +426,16 @@ export default { opacity: 1; cursor: default; } - li:hover .company_label_data { + li:hover .shewei { + opacity: 0; + } + li:hover .zhongdian { + opacity: 0; + } + li:hover .zhibao { + opacity: 0; + } + li:hover .zhian { opacity: 0; } li:hover span { diff --git a/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue b/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue index 07b7f95..7c860b4 100644 --- a/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue +++ b/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue @@ -18,7 +18,7 @@ :disabled="disabled" > - + - + - - + + - - + + @@ -162,7 +162,12 @@
    - 保 存 + 保 存 取 消
    @@ -230,7 +235,7 @@ export default { deviceIp: [ { required: true, message: "请填写设备ip", trigger: "blur" }, ], - deviceParentType: [ + deviceVideoParentType: [ { required: true, message: "请选择设备大类", trigger: "change" }, ], deviceVideoSubType: [ @@ -288,50 +293,48 @@ export default { } else if (num === "5") { this.dialogTitle = "详情"; this.form = row; - this.disabled = true + this.disabled = true; } }, - saveFormData: debounce(function (formName1,formName2,formName3) { + saveFormData: debounce(function (formName1, formName2, formName3) { this.$refs[formName1].validate((valid1) => { - console.log('valid1',valid1); if (valid1) { - this.$message.warning("请填入必填项"); + this.$refs[formName2].validate((valid2) => { + if (valid2) { + this.$refs[formName3].validate((valid3) => { + if (valid3) { + delete this.form.company; + delete this.form.video_type; + delete this.form.perception_type; + delete this.form.orientation_types; + this.form.companyId = this.$refs.companySelect.selected.value // 企业对应id + const params = this.form; + console.log("this.form", this.form); + if (this.dialogTitle === "新建") { + addVideoList(params) + .then((res) => { + this.visible = false; + this.$message({ + message: res.msg, + type: "success", + }); + }) + .catch((err) => { + console.log(err); //代码错误、请求失败捕获 + }); + } + } else { + this.$message.warning("请填入必填项"); + } + }); // 视频通道信息必填验证 + } else { + this.$message.warning("请填入必填项"); + } + }); // 视频通道信息必填验证 } else { - return false; - } - }); // 设备基础必填验证 - this.$refs[formName2].validate((valid2) => { - console.log('valid2',valid2); - if (valid2) { this.$message.warning("请填入必填项"); - } else { - return false; } - }); // 视频通道信息必填验证 - this.$refs[formName3].validate((valid3) => { - console.log('valid3',valid3); - if (valid3) { - this.$message.warning("请填入必填项"); - } else { - return false; - } - }); // 视频通道信息必填验证 - delete this.form.company; - delete this.form.video_type; - delete this.form.perception_type; - delete this.form.orientation_types; - const params = this.form; - console.log("this.form", this.form); - if (this.dialogTitle === "新建") { - addVideoList(params).then((res) => { - console.log("res78", res); - if (res.code === 200) { - this.visible = false; - } else { - this.$message.warning("新建失败"); - } - }); - } + }); // 设备基础必填验证 }, 300), }, };