diff --git a/src/views/modules/monitoring/product.vue b/src/views/modules/monitoring/product.vue
index 4c50d36..5c19d68 100644
--- a/src/views/modules/monitoring/product.vue
+++ b/src/views/modules/monitoring/product.vue
@@ -2,13 +2,13 @@
-
+
{{ $t('query') }}
-
- 新增
+
+ {{ $t('add') }}
@@ -46,7 +46,7 @@ import { dictFilter } from '@/utils/filters'
const UnitDictTypeId = '1557173812109242370'
const ProductTypeDictTypeId = '1557179530308616193'
const tableConfigs = [
- { type: 'index', name: i18n.t('index') },
+ { type: 'index', width: 100, name: i18n.t('index') },
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
{ prop: 'name', name: '产品名称' },
{ prop: 'code', name: '产品编码' },
@@ -116,9 +116,9 @@ const addOrUpdateConfigs = {
url: '/monitoring/productArrt',
relatedField: 'productId',
tableConfigs: [
- { type: 'index', name: i18n.t('index') },
+ { type: 'index', width: 100, name: i18n.t('index') },
{ prop: 'createTime', name: i18n.t('createTime'), filter: val => (val ? moment(val).format('YYYY-MM-DD hh:mm:ss') : '-') },
- { prop: 'name', name: '属性名', formField: true, rules: [{ required: true, message: i18n.t('required'), trigger: 'blur' }] },
+ { prop: 'name', name: '属性名称', formField: true, rules: [{ required: true, message: i18n.t('required'), trigger: 'blur' }] },
{ prop: 'code', name: i18n.t('attrValue'), formField: true },
{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
diff --git a/src/views/modules/monitoring/productArrt.vue b/src/views/modules/monitoring/productArrt.vue
index c229985..a989cec 100644
--- a/src/views/modules/monitoring/productArrt.vue
+++ b/src/views/modules/monitoring/productArrt.vue
@@ -2,11 +2,11 @@
-
+
{{ $t('query') }}
- 新增
+ {{ $t('add') }}
diff --git a/src/views/modules/monitoring/productionLine.vue b/src/views/modules/monitoring/productionLine.vue
index 576fae0..7d43794 100644
--- a/src/views/modules/monitoring/productionLine.vue
+++ b/src/views/modules/monitoring/productionLine.vue
@@ -2,11 +2,11 @@
-
+
{{ $t('query') }}
- 新增
+ {{ $t('add') }}
diff --git a/src/views/modules/monitoring/productionLineRecSch.vue b/src/views/modules/monitoring/productionLineRecSch.vue
index 9496ed0..1c7da16 100644
--- a/src/views/modules/monitoring/productionLineRecSch.vue
+++ b/src/views/modules/monitoring/productionLineRecSch.vue
@@ -2,11 +2,11 @@
-
+
{{ $t('query') }}
- 新增
+ {{ $t('add') }}
diff --git a/src/views/modules/monitoring/qualityInspectionCurrent.vue b/src/views/modules/monitoring/qualityInspectionCurrent.vue
index d82abce..fb423c9 100644
--- a/src/views/modules/monitoring/qualityInspectionCurrent.vue
+++ b/src/views/modules/monitoring/qualityInspectionCurrent.vue
@@ -7,9 +7,9 @@
type="daterange"
v-model="datetime"
value-format="yyyy-MM-ddTHH:mm:ss"
- start-placeholder="开始时间"
- end-placeholder="结束时间"
- range-separator="至"
+ :start-placeholder="$t('startTime')"
+ :end-placeholder="$t('endTime')"
+ :range-separator="$t('to')"
:default-time="['00:00:00', '23:59:59']"
:picker-options="quickOptions"
clearable
@@ -17,14 +17,14 @@
{{ $t('query') }}
-
+
- 上下片及检测总数统计
+ {{ $t('inspect.ioTotal') }}
@@ -34,12 +34,12 @@
- 各产线检测类型统计
+ {{ $t('inspect.plTotal') }}
-
-
+
+
@@ -69,14 +69,14 @@ import SmallTitle from '@/components/small-title'
import * as echarts from 'echarts'
const tableConfigStatic = [
- { type: 'index', name: i18n.t('index') },
+ { type: 'index', width: 100, name: i18n.t('index') },
{ name: '上片总数', prop: 'sumUp' },
{ name: '下片总数', prop: 'sumDown' },
{ name: '检测总数', prop: 'sumCheck' },
{ name: '比例', prop: 'scrapRatio', filter: val => (val || val === 0 ? `${val}%` : '-') }
]
const tableConfigDynamic = [
- { type: 'index', name: i18n.t('index') },
+ { type: 'index', width: 100, name: i18n.t('index') },
{ name: '检测类型', prop: 'inspectionContent' },
/** dynamic */
{ name: '检测类型总数', prop: '' },
@@ -192,7 +192,7 @@ const FakeChart = {
}
}
-const dict = [i18n.t('table2'), '图形']
+const dict = [i18n.t('table2'), i18n.t('graph')]
export default {
name: 'QualityInspectionCurrent',
components: { BaseTable, SmallTitle, FakeChart },
@@ -280,7 +280,7 @@ export default {
}
this.tableConfigDynamic = [
- { type: 'index', name: i18n.t('index') },
+ { type: 'index', width: 100, name: i18n.t('index') },
{ name: '检测类型', prop: 'inspectionContent' },
...subProps,
{ name: '检测类型总数', prop: 'sumInput' },
diff --git a/src/views/modules/monitoring/qualityInspectionDet.vue b/src/views/modules/monitoring/qualityInspectionDet.vue
index 70094f4..49df591 100644
--- a/src/views/modules/monitoring/qualityInspectionDet.vue
+++ b/src/views/modules/monitoring/qualityInspectionDet.vue
@@ -2,11 +2,11 @@
-
+
{{ $t('query') }}
- 新增
+ {{ $t('add') }}
diff --git a/src/views/modules/monitoring/qualityInspectionRecord.vue b/src/views/modules/monitoring/qualityInspectionRecord.vue
index 201149d..9442973 100644
--- a/src/views/modules/monitoring/qualityInspectionRecord.vue
+++ b/src/views/modules/monitoring/qualityInspectionRecord.vue
@@ -2,11 +2,11 @@
{{ $t('query') }}
- 新增
+ {{ $t('add') }}
diff --git a/src/views/modules/monitoring/qualityInspectionType.vue b/src/views/modules/monitoring/qualityInspectionType.vue
index a5f7042..afb6cfb 100644
--- a/src/views/modules/monitoring/qualityInspectionType.vue
+++ b/src/views/modules/monitoring/qualityInspectionType.vue
@@ -2,11 +2,11 @@
-
+
{{ $t('query') }}
- 新增
+ {{ $t('add') }}
diff --git a/src/views/modules/monitoring/realtimeEquipment.vue b/src/views/modules/monitoring/realtimeEquipment.vue
index dfa5514..552a895 100644
--- a/src/views/modules/monitoring/realtimeEquipment.vue
+++ b/src/views/modules/monitoring/realtimeEquipment.vue
@@ -8,7 +8,7 @@
- 设备生产实时数据
+ {{ $t('realtime.eq') }}
diff --git a/src/views/modules/monitoring/realtimeProductLine.vue b/src/views/modules/monitoring/realtimeProductLine.vue
index 7cbd276..aebcff3 100644
--- a/src/views/modules/monitoring/realtimeProductLine.vue
+++ b/src/views/modules/monitoring/realtimeProductLine.vue
@@ -8,7 +8,7 @@
- 产线生产实时数据
+ {{ $t('realtime.pl') }}
diff --git a/src/views/modules/monitoring/realtimeQualityInspection.vue b/src/views/modules/monitoring/realtimeQualityInspection.vue
index c4da23b..6fe82cb 100644
--- a/src/views/modules/monitoring/realtimeQualityInspection.vue
+++ b/src/views/modules/monitoring/realtimeQualityInspection.vue
@@ -1,7 +1,7 @@
- 质量检查实时数据
+ {{ $t('realtime.inspect') }}
diff --git a/src/views/modules/monitoring/reportCategory.vue b/src/views/modules/monitoring/reportCategory.vue
index 451945c..3a7ad2d 100644
--- a/src/views/modules/monitoring/reportCategory.vue
+++ b/src/views/modules/monitoring/reportCategory.vue
@@ -2,11 +2,11 @@
-
+
{{ $t('query') }}
- 新增
+ {{ $t('add') }}
diff --git a/src/views/modules/monitoring/reportDesign.vue b/src/views/modules/monitoring/reportDesign.vue
index 93a9328..b48a117 100644
--- a/src/views/modules/monitoring/reportDesign.vue
+++ b/src/views/modules/monitoring/reportDesign.vue
@@ -23,7 +23,6 @@ export default {
const ifream = document.getElementById('zgboke')
ifream.onload = function() {
- console.log('加载完成')
vm.loading = false
}
},
diff --git a/src/views/modules/monitoring/reportDetail.vue b/src/views/modules/monitoring/reportDetail.vue
index de8f0a0..522683f 100644
--- a/src/views/modules/monitoring/reportDetail.vue
+++ b/src/views/modules/monitoring/reportDetail.vue
@@ -2,12 +2,12 @@
-
+
{{ $t('query') }}
- 新增
+ {{ $t('add') }}
@@ -117,7 +117,7 @@ export default {
if (res.data && res.data.list) {
const categories = res.data.list.map(item => ({ label: item.name, value: item.id }))
this.tableConfigs = [
- { type: 'index', name: i18n.t('index') },
+ { type: 'index', width: 100, name: i18n.t('index') },
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter, width: 200 },
{ prop: 'fileName', name: '报表名称' },
{ prop: 'category', name: '报表分类', subcomponent: CategoryList, options: categories },
diff --git a/src/views/modules/monitoring/reportPreview.vue b/src/views/modules/monitoring/reportPreview.vue
index 5eef7fe..ddbdc7b 100644
--- a/src/views/modules/monitoring/reportPreview.vue
+++ b/src/views/modules/monitoring/reportPreview.vue
@@ -7,7 +7,7 @@
-->
- 报表名称:{{ $route.query.name }}
+ {{ $t('report.name') + ': ' + $route.query.name }}
diff --git a/src/views/modules/monitoring/reportSheet.vue b/src/views/modules/monitoring/reportSheet.vue
index d9cb527..fcda21d 100644
--- a/src/views/modules/monitoring/reportSheet.vue
+++ b/src/views/modules/monitoring/reportSheet.vue
@@ -2,11 +2,11 @@
-
+
{{ $t('query') }}
- 新增
+ {{ $t('add') }}
diff --git a/src/views/modules/monitoring/reportSheetCategory.vue b/src/views/modules/monitoring/reportSheetCategory.vue
index d810969..fdc97ec 100644
--- a/src/views/modules/monitoring/reportSheetCategory.vue
+++ b/src/views/modules/monitoring/reportSheetCategory.vue
@@ -2,11 +2,11 @@
-
+
{{ $t('query') }}
- 新增
+ {{ $t('add') }}
@@ -37,8 +37,8 @@ import TableTextComponent from '@/components/base-table/components/detailCompone
const tableConfigs = [
{ prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter },
- { prop: 'name', name: '分类名称' },
- { prop: 'code', name: '分类编码' },
+ { prop: 'name', name: i18n.t('categoryName') },
+ { prop: 'code', name: i18n.t('categoryCode') },
{ prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
]
diff --git a/src/views/modules/monitoring/sysfile.vue b/src/views/modules/monitoring/sysfile.vue
index 70f9d72..f0c0e62 100644
--- a/src/views/modules/monitoring/sysfile.vue
+++ b/src/views/modules/monitoring/sysfile.vue
@@ -2,11 +2,11 @@
-
+
{{ $t('query') }}
- 新增
+ {{ $t('add') }}
diff --git a/src/views/modules/monitoring/sysfileType.vue b/src/views/modules/monitoring/sysfileType.vue
index 2a70a65..8adaf68 100644
--- a/src/views/modules/monitoring/sysfileType.vue
+++ b/src/views/modules/monitoring/sysfileType.vue
@@ -2,11 +2,11 @@
-
+
{{ $t('query') }}
- 新增
+ {{ $t('add') }}
diff --git a/src/views/modules/monitoring/workShopSection.vue b/src/views/modules/monitoring/workShopSection.vue
index 3e8d3ba..731b2f9 100644
--- a/src/views/modules/monitoring/workShopSection.vue
+++ b/src/views/modules/monitoring/workShopSection.vue
@@ -2,11 +2,11 @@
-
+
{{ $t('query') }}
- 新增
+ {{ $t('add') }}
diff --git a/src/views/modules/monitoring/workShopSectionEquipment.vue b/src/views/modules/monitoring/workShopSectionEquipment.vue
index 897474c..542c26d 100644
--- a/src/views/modules/monitoring/workShopSectionEquipment.vue
+++ b/src/views/modules/monitoring/workShopSectionEquipment.vue
@@ -2,11 +2,11 @@
-
+
{{ $t('query') }}
- 新增
+ {{ $t('add') }}
diff --git a/src/views/modules/monitoring/workshopSectionDialog.vue b/src/views/modules/monitoring/workshopSectionDialog.vue
index 8d36657..e442d23 100644
--- a/src/views/modules/monitoring/workshopSectionDialog.vue
+++ b/src/views/modules/monitoring/workshopSectionDialog.vue
@@ -1,13 +1,13 @@
-
+
@@ -19,7 +19,7 @@
@@ -33,7 +33,7 @@