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

fzq #31

Closed
fanzhiqin wants to merge 215 commits from fzq into test
pull from: fzq
merge into: mt-fe-group:test
Conversation 0 Commits 215 Files Changed 195 +13 -5
7 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9b0f724da2 - Show all commits

2
src/i18n/en.js
View File

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

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

@ -13,7 +13,8 @@ export default {
// url: process.env.VUE_APP_REPORT_DESIGN_URL // url: process.env.VUE_APP_REPORT_DESIGN_URL
// url: window.SITE_CONFIG['apiURL'] + this.$http.adornUrl('/ureport/designer') // url: window.SITE_CONFIG['apiURL'] + this.$http.adornUrl('/ureport/designer')
// url: 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() { mounted() {

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

@ -125,7 +125,7 @@ export default {
prop: 'operations', prop: 'operations',
name: i18n.t('handle'), name: i18n.t('handle'),
fixed: 'right', fixed: 'right',
width: 180, // width: 180,
subcomponent: TableOperateComponent, subcomponent: TableOperateComponent,
options: [{ name: 'preview', emitField: 'fileName' }, { name: 'design', emitField: 'name' }, 'edit', 'delete'] 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, loading: true,
// url: process.env.VUE_APP_REPORT_VIEW_URL // url: process.env.VUE_APP_REPORT_VIEW_URL
// url: window.SITE_CONFIG['apiURL'] + this.$http.adornUrl('/ureport/preview') // 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() { mounted() {

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

@ -23,7 +23,8 @@ export default {
init() { init() {
this.visible = true this.visible = true
// this.url = `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${Cookies.get('token')}` // 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.num = 0
this.fileList = [] this.fileList = []
}, },

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

@ -103,7 +103,8 @@ export default {
getCaptcha() { getCaptcha() {
this.dataForm.uuid = getUUID() this.dataForm.uuid = getUUID()
// this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}` // 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( dataFormSubmitHandle: debounce(