mt-fe-group/mt-yd-ui
13
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

lb #4

Merged
gtz217 merged 3 commits from lb into develop 2022-09-26 17:03:20 +08:00
Conversation 0 Commits 3 Files Changed 11 +23 -12
11 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/i18n/en.js
View File

@@ -31,6 +31,8 @@ t.routes['质量检查实时数据'] = 'Realtime Quality Inspection Data'
t.routes['报表总览'] = 'Report Overview'
t.routes['报表分类'] = 'Report Types'
t.routes['报表详情'] = 'Report Detail'
t.routes['报表设计'] = 'Report Design'
t.routes['报表预览'] = 'Report Preview'
t.routes['质量检测基础数据'] = 'Quality Inspection Basic Data'
t.routes['当前检测数据'] = 'Current Inspection Data'
t.routes['质量检查信息记录'] = 'Quality Inspection Records'

2
src/i18n/zh-CN.js
View File

@@ -32,6 +32,8 @@ t.routes['质量检查实时数据'] = '质量检查实时数据'
t.routes['报表总览'] = '报表总览'
t.routes['报表分类'] = '报表分类'
t.routes['报表详情'] = '报表详情'
t.routes['报表设计'] = '报表设计'
t.routes['报表预览'] = '报表预览'
t.routes['质量检测基础数据'] = '质量检测基础数据'
t.routes['当前检测数据'] = '当前检测数据'
t.routes['质量检查信息记录'] = '质量检查信息记录'

6
src/views/modules/monitoring/qualityInspectionRecord.vue
View File

@@ -56,8 +56,10 @@ const tableConfigs = [
name: i18n.t('inspect.det')
},
{ prop: 'checkTime', name: i18n.t('inspect.time'), filter: timeFilter },
{ prop: 'productionId', name: i18n.t('pl.id') },
{ prop: 'sectionId', name: i18n.t('ws.id') },
{ prop: 'productionName', name: i18n.t('pl.title') },
{ prop: 'sectionName', name: i18n.t('ws.title') },
// { prop: 'productionId', name: i18n.t('pl.id') },
// { prop: 'sectionId', name: i18n.t('ws.id') },
{ prop: 'checkPerson', name: i18n.t('inspect.people') },
{ prop: 'source', name: i18n.t('source'), filter: val => ({ 1: i18n.t('manual'), 2: i18n.t('auto') }[val]) },
{ prop: 'explainText', name: i18n.t('desc') },

2
src/views/modules/monitoring/realtimeEquipment.vue
View File

@@ -129,7 +129,7 @@ export default {
{ prop: obj.recordTime + '-inputNum', label: i18n.t('realtime.in') },
{ prop: obj.recordTime + '-outputNum', label: i18n.t('realtime.out') },
{ prop: obj.recordTime + '-scrapNum', label: i18n.t('realtime.data') },
{ prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate') }
{ prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate'), filter: val => val !== '-' ? `${val.toFixed(2)}%` : '-' }
]
})
}

6
src/views/modules/monitoring/realtimeProductLine.vue
View File

@@ -113,9 +113,9 @@ export default {
children: [
{ prop: obj.recordTime + '-inputNum', label: i18n.t('realtime.in') },
{ prop: obj.recordTime + '-outputNum', label: i18n.t('realtime.out') },
{ prop: obj.recordTime + '-passArea', label: i18n.t('realtime.goodrate') },
{ prop: obj.recordTime + '-scrapNum', label: i18n.t('realtime.num') },
{ prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate') }
// { prop: obj.recordTime + '-passArea', label: i18n.t('realtime.goodrate') },
// { prop: obj.recordTime + '-scrapNum', label: i18n.t('realtime.num') },
// { prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate') }
]
})
}

3
src/views/modules/monitoring/realtimeQualityInspection.vue
View File

@@ -131,7 +131,8 @@ export default {
// 保存为 props
for (const key of sortedTime) {
const prop = { label: key, children: [] }
// const prop = { label: key, children: [] }
const prop = { label: moment(key).format('YYYY-MM-DD HH:mm:ss'), children: [] }
for (const subKey in timeMap[key]) {
prop.children.push({ label: subKey, prop: key + subKey })
}

3
src/views/modules/monitoring/reportDesign.vue
View File

@@ -13,7 +13,8 @@ export default {
// url: process.env.VUE_APP_REPORT_DESIGN_URL
// url: window.SITE_CONFIG['apiURL'] + this.$http.adornUrl('/ureport/designer')
// url: this.$http.adornUrl('/ureport/designer')
url: (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + '/ureport/designer'
// url: (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + '/ureport/designer'
url: '/api/ureport/designer'
}
},
mounted() {

2
src/views/modules/monitoring/reportDetail.vue
View File

@@ -125,7 +125,7 @@ export default {
prop: 'operations',
name: i18n.t('handle'),
fixed: 'right',
width: 180,
// width: 180,
subcomponent: TableOperateComponent,
options: [{ name: 'preview', emitField: 'fileName' }, { name: 'design', emitField: 'name' }, 'edit', 'delete']
}

3
src/views/modules/monitoring/reportPreview.vue
View File

@@ -23,7 +23,8 @@ export default {
loading: true,
// url: process.env.VUE_APP_REPORT_VIEW_URL
// url: window.SITE_CONFIG['apiURL'] + this.$http.adornUrl('/ureport/preview')
url: (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + '/ureport/preview'
// url: (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + '/ureport/preview'
url: '/api/ureport/preview'
}
},
mounted() {

3
src/views/modules/oss/oss-upload.vue
View File

@@ -23,7 +23,8 @@ export default {
init() {
this.visible = true
// this.url = `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${Cookies.get('token')}`
this.url = (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + `/sys/oss/upload?token=${Cookies.get('token')}`
// this.url = (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + `/sys/oss/upload?token=${Cookies.get('token')}`
this.url = `/api/sys/oss/upload?token=${Cookies.get('token')}`
this.num = 0
this.fileList = []
},

3
src/views/pages/login.vue
View File

@@ -103,7 +103,8 @@ export default {
getCaptcha() {
this.dataForm.uuid = getUUID()
// this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}`
this.captchaPath = (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + `/captcha?uuid=${this.dataForm.uuid}`
// this.captchaPath = (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + `/captcha?uuid=${this.dataForm.uuid}`
this.captchaPath = `/api/captcha?uuid=${this.dataForm.uuid}`
},
// 表单提交
dataFormSubmitHandle: debounce(