From 4f111a95d6b64af78fe466693963632181756e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Thu, 11 Apr 2024 11:03:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 6 +- src/views/OperationalOverview/coldBoard.vue | 2 +- .../components/ISRAChart.vue | 60 +++++++++++++++---- .../processEquMaterialBom/add-or-updata.vue | 10 ++-- .../processEquValueBom/add-or-updata.vue | 11 ++-- .../qualityInspectionBoxPermissions/index.vue | 10 ++-- 6 files changed, 70 insertions(+), 29 deletions(-) diff --git a/.env.dev b/.env.dev index 943c6ecc..882a92fe 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2024-04-10 08:26:13 + # @LastEditTime: 2024-04-10 16:58:06 # @LastEditors: zhp # @Description: ### @@ -20,11 +20,11 @@ VUE_APP_TITLE = MES系统 # VUE_APP_BASE_API = 'http://192.168.1.8:48082' # VUE_APP_BASE_API = 'http://192.168.4.173:9001' # VUE_APP_BASE_API = 'http://192.168.1.104:48082' -VUE_APP_BASE_API = 'http://192.168.0.33:48082' +# VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.1.62:48082' # VUE_APP_BASE_API = 'http://192.168.1.78:48082' # VUE_APP_BASE_API = 'http://192.168.1.47:48082' -# VUE_APP_BASE_API = 'http://192.168.1.78:48082' +VUE_APP_BASE_API = 'http://192.168.1.78:48082' # socket地址 # VUE_APP_Socket_API = 'ws://10.70.2.2:8080' # VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue index c8a8ab75..5025e36f 100644 --- a/src/views/OperationalOverview/coldBoard.vue +++ b/src/views/OperationalOverview/coldBoard.vue @@ -1,7 +1,7 @@ diff --git a/src/views/OperationalOverview/components/ISRAChart.vue b/src/views/OperationalOverview/components/ISRAChart.vue index f5f59018..75bb8f88 100644 --- a/src/views/OperationalOverview/components/ISRAChart.vue +++ b/src/views/OperationalOverview/components/ISRAChart.vue @@ -1,7 +1,7 @@ @@ -26,7 +26,7 @@ export default { return { chart: null, // notMsg:true, - colors:['#2760ff', '#518eec', '#0ee8e4', '#ddb523'], + colors: ['#2760ff', '#518eec', '#49FBD6', '#ddb523'], chartData: [] }; }, @@ -45,7 +45,32 @@ export default { this.$emit('emitFun') } } - }, + }, + mounted() { + this.chartData = [ + { + name: '细长泡', + num: 1112, + yield: 0.97, + }, + { + name: '长泡', + num: 1112, + yield: 0.97, + }, + { + name: '开口泡', + num: 1112, + yield: 0.97, + }, + { + name: '结石', + num: 1112, + yield: 0.97, + } + ] + this.updateChart() + }, methods: { updateChart() { console.log('update') @@ -71,7 +96,7 @@ export default { color:this.colors, title:{ text: num, - subtext: '总数', + subtext: '总数/片', top: '32%', left: '49%', textAlign: 'center', @@ -89,7 +114,7 @@ export default { left: 'center', itemWidth: 12, itemHeight:12, - icon: 'rect', + icon: 'roundRect', textStyle: { color: '#fff' }, @@ -107,21 +132,36 @@ export default { radius: ['45%', '70%'], avoidLabelOverlap: true, label: { - show: false + show: true, + normal: { + // 各分区的提示内容 + // params: 即下面传入的data数组,通过自定义函数，展示你想要的内容和格式 + formatter: function (params) { + console.log(params); + return params.value + " | " + params.percent.toFixed(0) + "%" + "\n\n" + params.name; + }, + textStyle: { // 提示文字的样式 + // color: '#595959', + fontSize: 24.48 + } + } }, labelLine: { show: true, }, data: this.chartData && this.chartData.length > 0 && this.chartData.map((item, index) => ({ name:item.name, - value: item.num, + value: item.num, + label: { + color: this.colors[index % 4] + }, itemStyle:{ color:{ type: 'linear', - x: 1, - y: 1, + x: 0, + y: 0, x2: 0, - y2: 0, + y2: 1, global: false, colorStops:[ {offset: 0,color: this.colors[index%4]}, diff --git a/src/views/extend/processEquMaterialBom/add-or-updata.vue b/src/views/extend/processEquMaterialBom/add-or-updata.vue index e9a0e2c9..b8e2102f 100644 --- a/src/views/extend/processEquMaterialBom/add-or-updata.vue +++ b/src/views/extend/processEquMaterialBom/add-or-updata.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-11-18 14:16:25 * @LastEditors: zhp - * @LastEditTime: 2024-03-22 17:11:55 + * @LastEditTime: 2024-04-11 09:10:16 * @Description: -->