mt-fe-group/tft-fe
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: mt-fe-group:194b2f0e0db16366260c049ffa43359e314d1200
Branches Tags
mt-fe-group:master
mt-fe-group:zjl
mt-fe-group:cicd4tftfe
..
compare: mt-fe-group:9c6bf7000865a95ef0a3bfa81c77470b9facdd24
Branches Tags
mt-fe-group:master
mt-fe-group:zjl
mt-fe-group:cicd4tftfe

2 Commits
194b2f0e0d ... 9c6bf70008

Author SHA1 Message Date
juzi
9c6bf70008 Merge pull request '5.18' (#18) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: #18
 2023-05-18 11:14:36 +08:00
juzi
61d55ac797 5.18 2023-05-18 11:14:03 +08:00
26 changed files with 41 additions and 41 deletions
Show Stats Expand all files Collapse all files

1
dist/css/299.450cca55.css vendored
View File

@ -1 +0,0 @@
.box[data-v-6ad9120b]{padding:0 32px}

0
dist/css/5705.c4e5dd1b.css → dist/css/3723.c4e5dd1b.css vendored
View File

1
dist/css/5060.d800e106.css vendored Normal file
View File

@ -0,0 +1 @@
.box[data-v-353959df]{padding:0 32px}

0
dist/css/8017.2b3c2c89.css → dist/css/5633.2b3c2c89.css vendored
View File

0
dist/css/8995.25c30150.css → dist/css/5640.25c30150.css vendored
View File

2
dist/css/2792.cb7289f3.css → dist/css/6831.cd6787cf.css vendored
View File

@ -1 +1 @@
.real-time-alarm[data-v-2529da08]{height:calc(100vh - 203px);padding:12px 16px;margin:0 16px;border-radius:8px;background-color:#fff} .real-time-alarm[data-v-f97d1bf4]{height:calc(100vh - 203px);padding:12px 16px;margin:0 16px;border-radius:8px;background-color:#fff}

0
dist/css/7572.8e7ab012.css → dist/css/8432.8e7ab012.css vendored
View File

2
dist/index.html vendored
View File

@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.a42f8636.js"></script><script defer="defer" src="/js/app.8ddc6159.js"></script><link href="/css/app.68cbc19b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html> <!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.a42f8636.js"></script><script defer="defer" src="/js/app.50e71cdc.js"></script><link href="/css/app.68cbc19b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

1
dist/js/2792.29278c33.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/js/299.4bb8fb60.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/5705.efe96667.js → dist/js/3723.3f05a75c.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/js/5060.f685ef99.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
dist/js/5633.cd27f4f8.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
dist/js/5640.c5ff6e0f.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
dist/js/6831.95f35749.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
dist/js/8017.892d4e4c.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/7572.13f4b99b.js → dist/js/8432.2eb6638c.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/js/8995.16c3f5b4.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/js/app.50e71cdc.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
dist/js/app.8ddc6159.js vendored
View File

File diff suppressed because one or more lines are too long

5
src/views/consumablesManagement/inAndOutManagement.vue
View File

@ -53,7 +53,7 @@ import {
getMaterialManagePage, getMaterialManagePage,
outInRecordRecordExport outInRecordRecordExport
} from '@/api/consumablesManagement' } from '@/api/consumablesManagement'
import { sideLibraryList, materialList } from '@/api/basicConfig' import { sideLibraryList, getMaterialArr } from '@/api/basicConfig'
const tableProps = [ const tableProps = [
{ {
prop: 'line', prop: 'line',
@ -154,6 +154,7 @@ export default {
labelField: 'name', labelField: 'name',
valueField: 'name', valueField: 'name',
defaultSelect: '', defaultSelect: '',
filterable: true,
width: 150 width: 150
}, },
{ {
@ -230,7 +231,7 @@ export default {
} }
}, },
getMaterialList() { getMaterialList() {
materialList().then((res) => { getMaterialArr().then((res) => {
console.log(res) console.log(res)
if (res.code === 0) { if (res.code === 0) {
this.formConfig[2].selectOptions = res.data this.formConfig[2].selectOptions = res.data

2
src/views/deviceManagement/alarmInformation/realTimeAlarm.vue
View File

@ -48,7 +48,7 @@ const tableProps = [
label: '报警内容' label: '报警内容'
}, },
{ {
prop: 'startTime', prop: 'startAlertTime',
label: '报警开始时间', label: '报警开始时间',
filter: timeFormatter, filter: timeFormatter,
minWidth: 160 minWidth: 160

4
src/views/deviceManagement/spareParts/sparePartsAdd.vue
View File

@ -22,6 +22,7 @@
<el-select <el-select
v-model="form.type" v-model="form.type"
placeholder="备件类别" placeholder="备件类别"
@change="selectName"
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
@ -170,6 +171,9 @@ export default {
this.sparePartsSpecList = [] this.sparePartsSpecList = []
}) })
}, },
selectName(val) {
console.log(val)
},
selectModel(val) { selectModel(val) {
getModelList({ getModelList({
name: val name: val

22
src/views/home/components/RingChart.vue
View File

@ -67,16 +67,13 @@ export default {
zlevel: 2, // 层级 zlevel: 2, // 层级
radius: ['47%', '50%'], radius: ['47%', '50%'],
center: ['50%', '45%'], center: ['50%', '45%'],
itemStyle: {
shadowBlur: 10,
shadowColor: 'rgba(209, 204, 214, 0.64)',
color: '#fff',
label: { label: {
show: false show: false
}, },
labelLine: { itemStyle: {
show: false shadowBlur: 10,
} shadowColor: 'rgba(209, 204, 214, 0.64)',
color: '#fff'
}, },
tooltip: { tooltip: {
show: false show: false
@ -92,16 +89,13 @@ export default {
radius: ['60%', '61%'], radius: ['60%', '61%'],
center: ['50%', '45%'], center: ['50%', '45%'],
zlevel: 1, // 层级 zlevel: 1, // 层级
itemStyle: {
shadowBlur: 10,
shadowColor: 'rgba(0,0,0,.5)',
color: '#fff',
label: { label: {
show: false show: false
}, },
labelLine: { itemStyle: {
show: false shadowBlur: 10,
} shadowColor: 'rgba(0,0,0,.5)',
color: '#fff'
}, },
tooltip: { tooltip: {
show: false show: false

22
src/views/productionScheduling/components/RingChart.vue
View File

@ -79,16 +79,13 @@ export default {
zlevel: 1, // 层级 zlevel: 1, // 层级
radius: ['55%', '58%'], radius: ['55%', '58%'],
center: ['50%', '40%'], center: ['50%', '40%'],
itemStyle: {
shadowBlur: 10,
shadowColor: 'rgba(209, 204, 214, 0.64)',
color: '#fff',
label: { label: {
show: false show: false
}, },
labelLine: { itemStyle: {
show: false shadowBlur: 10,
} shadowColor: 'rgba(209, 204, 214, 0.64)',
color: '#fff'
}, },
tooltip: { tooltip: {
show: false show: false
@ -104,16 +101,13 @@ export default {
radius: ['70%', '71%'], radius: ['70%', '71%'],
center: ['50%', '40%'], center: ['50%', '40%'],
zlevel: 1, // 层级 zlevel: 1, // 层级
itemStyle: {
shadowBlur: 10,
shadowColor: 'rgba(0,0,0,.5)',
color: '#fff',
label: { label: {
show: false show: false
}, },
labelLine: { itemStyle: {
show: false shadowBlur: 10,
} shadowColor: 'rgba(0,0,0,.5)',
color: '#fff'
}, },
tooltip: { tooltip: {
show: false show: false

7
src/views/qualityManagement/components/processFlowDetail.vue
View File

@ -54,6 +54,7 @@
import { tableHeight } from '@/utils/index' import { tableHeight } from '@/utils/index'
import { pageProcess } from '@/api/qualityManagement' import { pageProcess } from '@/api/qualityManagement'
import { timeFormatter } from '@/utils' import { timeFormatter } from '@/utils'
import { getParamList } from '@/api/processManagement'
const tableProps = [ const tableProps = [
{ {
prop: 'unitName', prop: 'unitName',
@ -185,10 +186,16 @@ export default {
console.log(val) console.log(val)
if (val.type === 'processParameters') { if (val.type === 'processParameters') {
this.processParametersVisible = true this.processParametersVisible = true
this.getProcess()
} else if (val.type === 'deviceParameters') { } else if (val.type === 'deviceParameters') {
this.deviceParametersVisible = true this.deviceParametersVisible = true
} }
}, },
getProcess() {
getParamList().then((res) => {
console.log(res)
})
},
handleCloseProcess() {}, handleCloseProcess() {},
handleCloseDevice() {} handleCloseDevice() {}
} }