From ec2d60fb5140e5be18bd85348c4796c2524f40c0 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Tue, 21 Jan 2025 15:21:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E4=BF=9D=E4=B8=8A=E4=BC=A0=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 6 +- package.json | 5 +- src/assets/img/titles/you.png | Bin 0 -> 1548 bytes src/assets/img/titles/zuo.png | Bin 0 -> 1547 bytes src/components/item-wrap/item-wrap.vue | 97 +++++++ src/main.js | 8 + src/views/collect/CollectOrderStatsNew.vue | 289 ++++++++------------- 7 files changed, 223 insertions(+), 182 deletions(-) create mode 100644 src/assets/img/titles/you.png create mode 100644 src/assets/img/titles/zuo.png create mode 100644 src/components/item-wrap/item-wrap.vue diff --git a/.env.production b/.env.production index 5a8be87a..ea448bb3 100644 --- a/.env.production +++ b/.env.production @@ -30,10 +30,10 @@ ENV = 'production' # 平和县医院 # VUE_APP_BASE_API = 'http://192.168.0.43:9150/UDI_WMS_MC/' -VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/' # 长泰医院 -# VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://192.168.6.189:9160/UDI_WMS_MC/' # 三明大田医院 # VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/' @@ -76,7 +76,7 @@ VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://116.204.116.198:9160/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' # 湖里妇幼 -VUE_APP_BASE_API = 'http://192.168.158.151:9150/UDI_WMS_MC/' + VUE_APP_BASE_API = 'http://192.168.158.151:9150/UDI_WMS_MC/' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' diff --git a/package.json b/package.json index b08fc24b..81a45964 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,12 @@ "author": "Glxp", "license": "MIT", "scripts": { - "build:prod": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", + "build:prod": " vue-cli-service build", "build:test": "vue-cli-service build --mode test", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src", "server": "SET NODE_OPTIONS=--openssl-legacy-provider && webpack-dev-server --env.server --env.develop --inline --max-old-space-size=3000", - "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --open" + "dev": " vue-cli-service serve --open" }, "husky": { "hooks": { @@ -39,6 +39,7 @@ "dependencies": { "@riophae/vue-treeselect": "0.4.0", "@tinymce/tinymce-vue": "^3.2.8", + "@jiaminghi/data-view": "^2.10.0", "axios": "0.24.0", "clipboard": "2.0.8", "core-js": "^3.19.1", diff --git a/src/assets/img/titles/you.png b/src/assets/img/titles/you.png new file mode 100644 index 0000000000000000000000000000000000000000..3877b31681894da023d64b6d6b2792dbbfb9e9d5 GIT binary patch literal 1548 zcmeAS@N?(olHy`uVBq!ia0vp^RzS?h!3HGj0{ABbDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#Xt>*L74G){)!Z!pk#?_L`iUdT1k0gQ7VIDN`6wRf@f}GdTLN= zVoGJ<$y6H#24=O)kcg59UmvUF{9L_6kQ%*;+ybC(1_m4Zih{)C?9>v4q}24xJX@vr zyZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL`NmQuF&B-ga zs<2f8n`;GRgM{^!6u?SKvTcwn`Gt*5rG%->zx70Hx^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal@=Hr>m4GgV zcp5iRovrD>Ay6RBR#McG9Qj-mfRP_#a=6Oi$E=sv)@BZv>@srorZVMKrlnS4^u&s9rNA7D6!w}_9V$VD} zPfWid^72*I6ZV|0m_9eY#Na0}e`b3q|FaD0DXH8a-y6j~=T_BkVgI)HSlPcm&v>gQ zCKpVS7Gi!;88dfw*a`m^d#+#J!c^TnM|`o-xubjbpOcEU-TS-NwtrrN@UOG;4u4t~ z>#U!qyUzW8O?=`9k^2vWV%qvI{#YPyd(Y{Oq}=q+|Ab`DAG~SNQD@w^P_AC8YVqEc z_x2p{_%7Lg_XTgUjZ@31`AO>^*GosYdEGwtEFkmrjb#Cv$>EPZbu^P>bKT^>bP0 Hl+XkK#|c2= literal 0 HcmV?d00001 diff --git a/src/assets/img/titles/zuo.png b/src/assets/img/titles/zuo.png new file mode 100644 index 0000000000000000000000000000000000000000..b3b355d25f6b65f9225b3b64769934a1bce4bae5 GIT binary patch literal 1547 zcmeAS@N?(olHy`uVBq!ia0vp^RzS?h!3HGj0{ABbDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#Xt>*L74G){)!Z!pk#?_L`iUdT1k0gQ7VIDN`6wRf@f}GdTLN= zVoGJ<$y6H#24=O)kcg59UmvUF{9L_6kQ%*;+ybC(1_m4Zih{)C?9>v4q}24xJX@vr zyZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL`NmQuF&B-ga zs<2f8n`;GRgM{^!6u?SKvTcwn`Gt*5rG%->zx70Hx^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal@=Hr>m4GgV zcpxzh{ho+D~Pinx1jn@u&S^sC1-Y9nT+@)jZL^3BiaeGc* zA>hiQm?cs(`-fT8xmk^cWo4eP{~k8@C%1)vwI(79dI}5()r^D3V)*e4sR&bXqZvR1} zBR5%oFO;@B#NUzppX19RYY*{cQ7Q+|1-?_$6Aw`T&Gx77>Pf46DpyXi1zx_iY2%8_ z$eSTo{^V~uXUeV^8QEIIdA#TE&hItxJ8x}&_x^PKC)OC5-?3{<>p8B=!#XH~U6|gcD^J9ClB1Y?>{s z6L?}4?Eb*;sN#R-ixz7G*1|pim2#RncW@Qje9k|_DA8WLVNTb&uuE&)isT-#c%JuD zeeXO+;bpPLOLqgm2_b48zt$)^Zjx_G`T4TPH9G7P%f)HaOuC|CXRFNJ<9X?yn&;}c z$xG_(SxYDVW7)${I_X@s?36Ft3tTT%?1}g*bH-?%m(=R}Q5%jdpQIMz-tDKAIp@lE zoA!`P7W+f5)pJ}rlsqMhLHq00sb#Z{KQNxt-jxz4a#a4=W+};k6KuUfg{`NnpUXO@ GgeCyZf + + + + diff --git a/src/main.js b/src/main.js index 9da274bf..2b785b13 100644 --- a/src/main.js +++ b/src/main.js @@ -53,6 +53,8 @@ import DictData from "@/components/DictData"; import cusEditor from '@/views/components/cusEditor.vue' import splitPane from 'vue-splitpane' +import ItemWrap from './components/item-wrap/item-wrap.vue' +import {borderBox13} from '@jiaminghi/data-view' // 去除控制台的 Vue warn 警告信息 Vue.config.silent = true; @@ -111,6 +113,8 @@ Vue.component("planChooseDevice", planChooseDevice) Vue.component("deviceInfo", deviceInfo) Vue.component("deviceRepairDialog", deviceRepairDialog) Vue.component("Echart", Echart) +Vue.component("ItemWrap", ItemWrap) + Vue.use(directive); Vue.use(plugins); @@ -118,6 +122,10 @@ Vue.use(VueMeta); Vue.use(allTools); Vue.use(ShowMsgBox) Vue.use(winExtend); +// datav组件 +Vue.use(borderBox13) + + DictData.install(); /** diff --git a/src/views/collect/CollectOrderStatsNew.vue b/src/views/collect/CollectOrderStatsNew.vue index 7ede1906..68c182ca 100644 --- a/src/views/collect/CollectOrderStatsNew.vue +++ b/src/views/collect/CollectOrderStatsNew.vue @@ -4,111 +4,52 @@ + + - - + + + -
- - 重置 - - 查询 - - -
+
-
+
@@ -178,6 +119,57 @@
+
+ + + + + +
+ + + + + +
+ +
+
+ + + + +
+ + +
+ +
+
+ + + +
+ + + +
+ +
+
+
@@ -209,61 +201,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -311,7 +249,6 @@ export default { salesScanCount: 0, fifoSplitOneCount:0, fifoSplitTwoCount:0, - fifoSplitThreeCount:0, }, @@ -435,7 +372,6 @@ export default { salesScanCount: res.data.salesScanCount, fifoSplitOneCount:res.data.fifoSplitOneCount, fifoSplitTwoCount:res.data.fifoSplitTwoCount, - fifoSplitThreeCount:res.data.fifoSplitThreeCount, } @@ -464,8 +400,8 @@ export default { initStatsChart1(){ const dataArr = [ this.stats.buyerScanCount,this.stats.salesScanCount - ] - console.log('dataArr',dataArr) + ]; + console.log('dataArr',dataArr); this.statsChart1 = { color: ['#01c6fd'], grid: { @@ -516,7 +452,8 @@ export default { color: '#000000' }, formatter: function (value) { - return value + "" + // 这里修改 y 轴的数值显示,可以通过乘以一个倍数来增大显示的值 + return (value * 10) + ""; }, }, } @@ -529,21 +466,19 @@ export default { data: dataArr, label: { normal: { - show: true,//开启显示 - position: 'top',//柱形上方 - textStyle: { //数值样式 + show: true, // 开启显示 + position: 'top', // 柱形上方 + textStyle: { // 数值样式 color: '#000000' } } } - }, - - + } ] }; }, initStatsChart2(){ - let colors = ["#ff0000","#ffca29", "#01c6fd"]; + let colors = ["#d30101","#ffca29", "#01c6fd"]; let piedata = { name: "医保上传率", type: "pie", @@ -629,11 +564,11 @@ export default { lineHeight: 26, }, c: { - color: "#31ABE3", + color: "#2b91c2", fontSize: 14, }, per: { - color: "#31ABE3", + color: "#2b91c2", fontSize: 14, }, }, @@ -678,7 +613,7 @@ export default { }; }, initStatsChart3(){ - let colors = ["#ff0000","#ffca29", "#01c6fd"]; + let colors = ["#d30101", "#01c6fd"]; let piedata = { name: "赋码方式", type: "pie", @@ -693,25 +628,19 @@ export default { data: [ { value: this.stats.fifoSplitOneCount , - name: "自动拆零赋码数", + name: "拆零赋码数", label: { shadowColor: colors[0], }, }, { value: this.stats.fifoSplitTwoCount, - name: "自动整取赋码数", + name: "整取赋码数", label: { shadowColor: colors[1], }, }, - { - value: this.stats.fifoSplitThreeCount, - name: "手动赋码数", - label: { - shadowColor: colors[2], - }, - }, + ], }; this.statsChart3 = { @@ -764,11 +693,11 @@ export default { lineHeight: 26, }, c: { - color: "#31ABE3", + color: "#2b91c2", fontSize: 14, }, per: { - color: "#31ABE3", + color: "#2b91c2", fontSize: 14, }, }, @@ -991,5 +920,11 @@ export default { float: left; width: 37.5%; } +//左右两侧 三个块 +.contetn_lr-item { + height: 282px; + margin-top: 10px; +} +