mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改看板

Browse Source
This commit is contained in:
‘937886381’ 2024-04-11 11:03:48 +08:00
parent 0b1761e83c
commit 4f111a95d6
6 changed files with 70 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env.dev
View File

@ -1,7 +1,7 @@
### ###
# @Author: Do not edit # @Author: Do not edit
# @Date: 2023-08-29 09:40:39 # @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-04-10 08:26:13 # @LastEditTime: 2024-04-10 16:58:06
# @LastEditors: zhp # @LastEditors: zhp
# @Description: # @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.1.8:48082'
# VUE_APP_BASE_API = 'http://192.168.4.173:9001' # 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.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.62:48082'
# VUE_APP_BASE_API = 'http://192.168.1.78: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.47:48082'
# VUE_APP_BASE_API = 'http://192.168.1.78:48082' VUE_APP_BASE_API = 'http://192.168.1.78:48082'
# socket地址 # socket地址
# VUE_APP_Socket_API = 'ws://10.70.2.2:8080' # VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
# VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' # VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'

2
src/views/OperationalOverview/coldBoard.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-01-29 16:50:26 * @Date: 2024-01-29 16:50:26
* @LastEditTime: 2024-04-07 16:05:59 * @LastEditTime: 2024-04-11 09:55:04
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->

56
src/views/OperationalOverview/components/ISRAChart.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-01-29 13:45:56 * @Date: 2024-01-29 13:45:56
* @LastEditTime: 2024-03-13 08:58:01 * @LastEditTime: 2024-04-11 11:02:53
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -26,7 +26,7 @@ export default {
return { return {
chart: null, chart: null,
// notMsg:true, // notMsg:true,
colors:['#2760ff', '#518eec', '#0ee8e4', '#ddb523'], colors: ['#2760ff', '#518eec', '#49FBD6', '#ddb523'],
chartData: [] chartData: []
}; };
}, },
@ -45,6 +45,31 @@ export default {
this.$emit('emitFun') 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: { methods: {
updateChart() { updateChart() {
@ -71,7 +96,7 @@ export default {
color:this.colors, color:this.colors,
title:{ title:{
text: num, text: num,
subtext: '总数', subtext: '总数/片',
top: '32%', top: '32%',
left: '49%', left: '49%',
textAlign: 'center', textAlign: 'center',
@ -89,7 +114,7 @@ export default {
left: 'center', left: 'center',
itemWidth: 12, itemWidth: 12,
itemHeight:12, itemHeight:12,
icon: 'rect', icon: 'roundRect',
textStyle: { textStyle: {
color: '#fff' color: '#fff'
}, },
@ -107,7 +132,19 @@ export default {
radius: ['45%', '70%'], radius: ['45%', '70%'],
avoidLabelOverlap: true, avoidLabelOverlap: true,
label: { 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: { labelLine: {
show: true, show: true,
@ -115,13 +152,16 @@ export default {
data: this.chartData && this.chartData.length > 0 && this.chartData.map((item, index) => ({ data: this.chartData && this.chartData.length > 0 && this.chartData.map((item, index) => ({
name:item.name, name:item.name,
value: item.num, value: item.num,
label: {
color: this.colors[index % 4]
},
itemStyle:{ itemStyle:{
color:{ color:{
type: 'linear', type: 'linear',
x: 1, x: 0,
y: 1, y: 0,
x2: 0, x2: 0,
y2: 0, y2: 1,
global: false, global: false,
colorStops:[ colorStops:[
{offset: 0,color: this.colors[index%4]}, {offset: 0,color: this.colors[index%4]},

8
src/views/extend/processEquMaterialBom/add-or-updata.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-03-22 17:11:55 * @LastEditTime: 2024-04-11 09:10:16
* @Description: * @Description:
--> -->
<template> <template>
@ -237,9 +237,6 @@ export default {
// console.log(response); // console.log(response);
this.equipmentList = res.data this.equipmentList = res.data
}) })
getMaterialCode().then(res => {
this.dataForm.code = res.data
})
}, },
handleClick(raw) { handleClick(raw) {
if (raw.type === 'delete') { if (raw.type === 'delete') {
@ -293,6 +290,9 @@ export default {
this.idAttrShow = true this.idAttrShow = true
} else { } else {
this.idAttrShow = false this.idAttrShow = false
getMaterialCode().then(res => {
this.dataForm.code = res.data
})
} }
this.$nextTick(() => { this.$nextTick(() => {

9
src/views/extend/processEquValueBom/add-or-updata.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-03-25 14:07:31 * @LastEditTime: 2024-04-11 09:10:35
* @Description: * @Description:
--> -->
<template> <template>
@ -246,9 +246,7 @@ export default {
// console.log(response); // console.log(response);
this.equipmentList = res.data this.equipmentList = res.data
}) })
getValueCode().then(res => {
this.dataForm.code = res.data
})
}, },
handleClick(raw) { handleClick(raw) {
if (raw.type === 'delete') { if (raw.type === 'delete') {
@ -326,6 +324,9 @@ export default {
this.idAttrShow = true this.idAttrShow = true
} else { } else {
this.idAttrShow = false this.idAttrShow = false
getValueCode().then(res => {
this.dataForm.code = res.data
})
} }
this.$nextTick(() => { this.$nextTick(() => {

10
src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
View File

@ -66,7 +66,7 @@ export default {
param: 'nickName', param: 'nickName',
}, },
{ {
type: this.$auth.hasPermi('base:quality-inspection-box-permissions:query') type: this.$auth.hasPermi('base:quality-inspection-box-btn-auth:query')
? 'button' ? 'button'
: '', : '',
btnName: '查询', btnName: '查询',
@ -74,12 +74,12 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: this.$auth.hasPermi('base:quality-inspection-box-permissions:create') type: this.$auth.hasPermi('base:quality-inspection-box-btn-auth:create')
? 'separate' ? 'separate'
: '', : '',
}, },
{ {
type: this.$auth.hasPermi('base:quality-inspection-box-permissions:create') type: this.$auth.hasPermi('base:quality-inspection-box-btn-auth:create')
? 'button' ? 'button'
: '', : '',
btnName: '新增', btnName: '新增',
@ -89,13 +89,13 @@ export default {
}, },
], ],
tableBtn: [ tableBtn: [
this.$auth.hasPermi('base:quality-inspection-box-permissions:update') this.$auth.hasPermi('base:quality-inspection-box-btn-auth:update')
? { ? {
type: 'edit', type: 'edit',
btnName: '修改', btnName: '修改',
} }
: undefined, : undefined,
this.$auth.hasPermi('base:quality-inspection-box-permissions:delete') this.$auth.hasPermi('base:quality-inspection-box-btn-auth:delete')
? { ? {
type: 'delete', type: 'delete',
btnName: '删除', btnName: '删除',