From c8b174547332be8234f54ea7a7bad4dff095ff8d Mon Sep 17 00:00:00 2001 From: long <18782126717@163.com> Date: Wed, 1 Feb 2023 15:35:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E3=80=81=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=85=B3=E9=97=AD=E6=8F=90=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 6 +- src/css/ali.css | 76 ++++++++++++++++++ src/css/font_3733417_ws9m9bvag1h.woff2 | Bin 0 -> 1696 bytes src/views/activiti/applyHome.vue | 23 +++++- src/views/activiti/applyList.vue | 22 ++--- src/views/activiti/doneManage.vue | 8 +- .../form/ProcessMaterialWarehousingForm.vue | 2 +- .../activiti/form/ProcessUdgetPlanForm.vue | 10 +-- src/views/activiti/processFinishManage.vue | 8 +- src/views/activiti/processInsManage.vue | 10 +-- src/views/activiti/todoManage.vue | 10 +-- src/views/dashboard/HomePage.vue | 2 +- .../description/ProcessDescriptionList.vue | 18 ++--- .../ProcessMaterialStorageList.vue | 18 ++--- .../ProcessMerchandiseNewsList.vue | 16 ++-- src/views/supplier/ProcessSupplierList.vue | 12 +-- .../ProcessSuppliesStrongerList.vue | 6 +- .../ProcessSuppliesStrongerLists.vue | 2 +- src/views/system/UserList.vue | 4 +- .../ProcessUnitWasteWarehouseCodeList.vue | 18 ++--- .../ProcessWasteMaterialsList.vue | 6 +- 21 files changed, 183 insertions(+), 94 deletions(-) create mode 100644 src/css/ali.css create mode 100644 src/css/font_3733417_ws9m9bvag1h.woff2 diff --git a/.env.production b/.env.production index 54499d6..327ec31 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://haoyi.scyp.ink/prod-api -VUE_APP_CAS_BASE_URL=http://localhost:8888/cas -VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file +VUE_APP_API_BASE_URL=http://10.242.144.23/prod-api +VUE_APP_CAS_BASE_URL=http://10.242.144.23:8888/cas +VUE_APP_ONLINE_BASE_URL=http://10.242.144.23:8012/onlinePreview \ No newline at end of file diff --git a/src/css/ali.css b/src/css/ali.css new file mode 100644 index 0000000..6288dc5 --- /dev/null +++ b/src/css/ali.css @@ -0,0 +1,76 @@ +@font-face { + font-family: "iconfont"; /* Project id 3733417 */ + /* Color fonts */ + src: + url('font_3733417_ws9m9bvag1h.woff2') format('woff2'), + url('font_3733417_ws9m9bvag1h.woff2') format('woff'), + url('font_3733417_ws9m9bvag1h.woff2') format('truetype'); +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-shenglvehao:before { + content: "\e708"; +} + +.icon-lianxiren:before { + content: "\e66f"; +} + +.icon-lianxiren1:before { + content: "\e654"; +} + +.icon-daibanrenwu:before { + content: "\eb29"; +} + +.icon-rizhi:before { + content: "\e627"; +} + +.icon-B-lianxiren:before { + content: "\e728"; +} + +.icon-process:before { + content: "\e75d"; +} + +.icon-suggest:before { + content: "\e767"; +} + +.icon-lianxiren2:before { + content: "\e6c4"; +} + +.icon-lianxiren1-copy:before { + content: "\eb2a"; +} + +.icon-lianxiren-copy:before { + content: "\eb2b"; +} + +.icon-rizhi-copy:before { + content: "\eb2c"; +} + +.icon-process-copy:before { + content: "\eb2d"; +} + +.icon-process-copy1:before { + content: "\eb2e"; +} + +.icon-suggest-copy:before { + content: "\eb2f"; +} diff --git a/src/css/font_3733417_ws9m9bvag1h.woff2 b/src/css/font_3733417_ws9m9bvag1h.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..bd4f91485a4316b396fa1982991fcade3b6c007a GIT binary patch literal 1696 zcmV;R24DGiPew8T0RR9100y7{3;+NC01Z?C00vM10RR9100000000000000000000 z0000YfjA=?24Dbu3Xv3yegQTDBm-;Y7OCIo$cWQP#vtSKM7U5NwzsW*iTo zJ@)$m`N~wIymZcF84LsR4-{ainN&{z&3H4UC(=neLNtVHgkX($2p{g}$1^^>52H3Qj8eml8%@-o%)_Cr zYKrHNaqT7w$1Yaq+yO?~$qmve^y8d>#1R)E4z`zI5VqDatX7tWw48O;5QkU6Ixpy{ zqOPv$nD^!4Tq6P(x=L_xuCjWPIzyuN0vjHW0|s%<6N8l zJj4-K)1GWioKyGOE@)P~C)T%S9dWErf8{vmIx4!?LRur3Elb2D0W$z;GOOvL(kb;i z6${Sg_M;DQjw5GMCdB*ORORq+!`!tYk}pks=bmGoXM!h3DKf7v{;S|uNJ1)id4zFs zIVAVEWn6}-2y(>X^Rxh`I?yb(o1PFjsdhg!#uzU|+Nmw7j&q#_Bc1s(=$wl~&vSh| zfev47vgHS%oB9Hv%TI8li9^90;ae*7dOpSTh*qB@jAI? zho4KD#_fO!`sv(F+|@_{ODfsgT!d}cld53BeWirFAP-B5PmmR8KLN$6Ya9w~BU5mytVUNW~G~Bman$BMdSWH~pn$ z^&izRb+d`$B0+>GED}Xze*P#5;&ef%T_63sm-$r>YBIaME>fpU)7jHUw{15%-EKF) zP>{Wjt;Y64$5jt1^Sj<`L}Po&;K3z!y8(9C8&?~5-kp|GTAGrUMl(}N(~9rJqgu|$ z={q#t>Av6Pj(T`R&x$|%+VeI6S4H19*G?3hX-o3elX2pSYk1ztHr>EpW25}1O+&ru zQT2L+h4v_kt_%&U%t-5Dcj}Rz-f9f=)29YRO(@u|AMZL|HSu)a+&rJ}$!ll+PbtqJ z;|&77*Y?deCq}IWKhm(qFp@W-o`!3nRm>Zq#80hGP^qH3$Hokg=G_z2YCoam&FT0g zt1SsF69%d*&wPEKS?rd`qvmTPwN|9&=cv_sxXHYcQQ0p?x3?Sp5?7NWo=4DVekd9v zvz{?QPH2{B7|Rri%@VG+duK+l+QQq~cfND3MXV5Gv&9I40RD$UY>RVNbEjT9dt-$q zcmhGllPZ20Wt?ejgi;LNOPP6F(O^A84=!j0VI#ksm}c;eP&RlEZ|1E*BtC#z$Pxou0)mPKleM9=3IpI9`|LKbvHUEIVfM8SE|^y9pUhm& ztR3tbvi9xLcVjh3v@o4mh{45fu;NctE=Mgqj_ZbDDwK#0-JPVi8d9Qp=45;x7QO=? zVG6p?u7-+67D81F!cneLAP~bz*|pbS=!0$;gn{U3?=~Ez=z(4sf&S=%p-4p%QdBV? q&C$Y;J?nP*aEa$`hsp}4%1Y%>3_~9b4tLO}P2DtPdGdOs0{{R? + @afterSubmit="afterSub" @close="closeThis"> @@ -131,6 +131,21 @@ } }); }, + closeThis(){ + this.lcModa.visible=false + this.lcModa.disabled = false + }, + close(){ + this.$confirm({ + title: "关闭", + content: `确定关闭当前页面？`, + centered: true, + onOk: () => { + this.lcModa.visible=false + this.lcModa.disabled = false + }, + }) + }, filterDictText(dictOptions, text) { if (dictOptions instanceof Array) { for (let dictItem of dictOptions) { diff --git a/src/views/activiti/applyList.vue b/src/views/activiti/applyList.vue index ade6a5f..a2e35f6 100644 --- a/src/views/activiti/applyList.vue +++ b/src/views/activiti/applyList.vue @@ -92,29 +92,29 @@ @@ -144,7 +144,7 @@ {{item.name}} - 发起申请 + 发起申请 @@ -159,7 +159,7 @@ - + diff --git a/src/views/activiti/doneManage.vue b/src/views/activiti/doneManage.vue index d1979ed..c4f5f4a 100644 --- a/src/views/activiti/doneManage.vue +++ b/src/views/activiti/doneManage.vue @@ -103,12 +103,12 @@ @@ -122,7 +122,7 @@ - + diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue index fc2f8bf..a3f6f07 100644 --- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue +++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue @@ -874,6 +874,6 @@ \ No newline at end of file diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue index 8ca3488..450872b 100644 --- a/src/views/activiti/form/ProcessUdgetPlanForm.vue +++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue @@ -170,7 +170,6 @@ - 保存 通过 @@ -434,7 +433,7 @@ key: 'materialPrice', type: FormTypes.inputNumber, disabled: this.disabled, - width: '200px', + width: '130px', placeholder: '请输入${title}', defaultValue: '' }, @@ -465,7 +464,7 @@ key: 'materialQuantity', type: FormTypes.inputNumber, disabled: this.disabled, - width: '200px', + width: '120px', placeholder: '请输入${title}', defaultValue: '' }, @@ -474,7 +473,7 @@ key: 'materialAmount', type: FormTypes.inputNumber, disabled: true, - width: '200px', + width: '120px', placeholder: '请输入${title}', defaultValue: '' }, @@ -1569,7 +1568,6 @@ \ No newline at end of file diff --git a/src/views/activiti/processFinishManage.vue b/src/views/activiti/processFinishManage.vue index 336bbdc..18b57e0 100644 --- a/src/views/activiti/processFinishManage.vue +++ b/src/views/activiti/processFinishManage.vue @@ -116,10 +116,10 @@ @@ -133,7 +133,7 @@ - + diff --git a/src/views/activiti/processInsManage.vue b/src/views/activiti/processInsManage.vue index 0338be0..f24a78b 100644 --- a/src/views/activiti/processInsManage.vue +++ b/src/views/activiti/processInsManage.vue @@ -98,12 +98,12 @@ --> - 流程数据 - - 操作记录 + 流程数据 + 操作记录 + - 删除 + 删除 @@ -135,7 +135,7 @@ - + diff --git a/src/views/activiti/todoManage.vue b/src/views/activiti/todoManage.vue index e9d3a67..0492128 100644 --- a/src/views/activiti/todoManage.vue +++ b/src/views/activiti/todoManage.vue @@ -117,21 +117,21 @@