Merge pull request 'lb' (#4) from lb into develop

Reviewed-on: #4

src/i18n/en.js

@@ -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'

src/i18n/zh-CN.js

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

src/views/modules/monitoring/qualityInspectionRecord.vue

@@ -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: 'productionName', name: i18n.t('pl.title') },
-	{ prop: 'sectionId', name: i18n.t('ws.id') },
+	{ 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') },

src/views/modules/monitoring/realtimeEquipment.vue

@@ -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)}%` : '-' }
 										]
 									})
 								}

src/views/modules/monitoring/realtimeProductLine.vue

@@ -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 + '-passArea', label: i18n.t('realtime.goodrate') },
-									{ prop: obj.recordTime + '-scrapNum', label: i18n.t('realtime.num') },
+									// { prop: obj.recordTime + '-scrapNum', label: i18n.t('realtime.num') },
-									{ prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate') }
+									// { prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate') }
 								]
 							})
 						}

src/views/modules/monitoring/realtimeQualityInspection.vue

@@ -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 })
 				}

src/views/modules/monitoring/reportDesign.vue

@@ -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() {

src/views/modules/monitoring/reportDetail.vue

@@ -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']
 						}

src/views/modules/monitoring/reportPreview.vue

@@ -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() {

src/views/modules/oss/oss-upload.vue

@@ -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 = []
 		},

src/views/pages/login.vue

@@ -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(